Improvements to UI and method refactoring
Merge branch 'master' of github.com:Elinos/Wyvern