Fixed routes and added/modified some actions