Fixed button layout issues