Fixed button covering issue