Merge pull request #67 from dannybutler/master

Significant UI code restructuring