Clean up button layout