WIP
WIP
Increase legibility
Small changes
Clean up dead code
WIP
WIP
Align toggle icons to text
WIP
Rebase off latest 1.0-wip branch