Bit of clean up and some modifications of the UI