UI updates
Merge pull request #55 from cameronklein/ArchiveFix

Archive fix
Merge branch 'master' into NateUI
Lots of UI changes and some bugs.