Further refinement of the UI layout