changes to user presentation
Merge branch 'master' of https://github.com/jeffj/hypermarks