finish layout and routes
finish updating links