Did some cosmetic cleaning of the UI