Fixing buttons active/inactive switch