Merge pull request #279 from bphinz/ui-fixes

Various fixes for Java viewer UI