Improved UI layout and spacing