Improved UI and buttons