Fixed button display issues