Slight improvements to the UI layout