Attempt to fix buttons