window and multi-file navigation additions

This also cleans up a lot of the settings,
ro-organizing them so they are a lot cleaner
laid out.