Merge pull request #93 from NoblesseOblige/master

Switches, menus, layouts. It's like an El Camino now.
Add a watcher to save directory values when text changes
Remove unused code, Save directory on edit text changed