Finish layout and routes
Forgot to merge my branch