Finish layout and routes
Missed files