Add partials & Change routes
Shorten  tests
Finish layout and routes