Various UI updates
Merge pull request #37 from UoGSOCIS/ui-fixes

Various UI updates