Merge pull request #310 from tochman/fixes

UI updates
Merge pull request #311 from tochman/fixes

Fixes for UI PR
fixed up some ui details in users/show