more UI work
Merge pull request #28 from Randgalt/master

Updates