Updated activating and deactivating buttons