UI updates
Merge pull request #1 from cassiopaia/master

UI updates