Finish layout and routes
Fix specs