Users controller and other features added