Enhancement

Improves the layout and structure of the UI and builds better UX.