finish layout and routes
merge conflicts