Add toggle feature and continue front end refactor.