Improved UI layout and header buttons