Add toggle button, various refactor/ simplification