Finish layout and routes
damn typos