fixed bug with activate/deactivate buttons