Add some UI changes to tidy up