Small changes to users module. Removed decorators.
Still thinking about JS... need to refactor with modules.