Fixing button display consistency