Fixed activate/deactivate buttons appearing