small changes
finish layout and routes