New Prototype

This has a bunch of changes as indicated by the commits, but mainly it includes a whole new prototype for the settings screen in particular.