Fixing button layout issues