Fixed some todos, cleaned up the codebase
Made the UI suck less
Merge pull request #37 from theras/master

Tidied up the codebase, fixed some todos