Added user controller and rework views