Changing layout
Fixing route test