added more functionality to
cleaned up some code and added more UI
Merge pull request #16 from theoblivious/refactoring

Refactoring