Fixing buttons still