Fixed routes & controllers
Fixing bugs