update stuff and fix tests
finish layout and routes