Refactor UI toggles