improved button layout