Added 2nd set of state changes when sidebar buttons enabled