Cleaning up the ui a little bit

'