updated a lot of functionality and views
Merge branch 'master' of https://github.com/Orkish/Orkish.github.io