Clean / improve / update code and UI.
