Reconfigured routes and user controller James wrote.
Fixed conflict.