Finish layout and routes
refact