MOAR UI changes.
Merge pull request #28 from emtwo/ui-changes

MOAR UI changes.