Merge pull request #93 from aesprice/master

UI fixes