kasey's ui stuff
Merge branch 'master' of https://github.com/alixander/thorne_hackathon into 08-23b

ui fixes
restructured
deleted some stuff
Merge branch 'master' of https://github.com/alixander/thorne_hackathon into 08-23b

restructured stuff