Began tidying up the UI.