Improved button layout