More cleaning/refactoring javascript stuff
Cleaning up users/show
Various tweaks/fixes