ui stuff

ui stuff
Merge pull request #14 from watshisface/master

ui stuff
Merge remote-tracking branch 'pivot/master'