Finish layout and routes
fixbugs