Fixed forgotten variable
Changes in controller structure and routes