Some minor alteration, mainly to the UI again