Update tests and styles
Finish layout and routes