adds some style
changes
refactor, hardcore
refactors out mainView
repairs bugs
Merge branch 'master' into gh-pages