UI changes

UI cleanup for multiple screen sizes