some more work on the UI
Merge branch 'master' of github.com:greathouse/star-slam