Merge pull request #25 from ScottPolhemus/master

UI stuff