Reroute pages and add style
Improve tests
Improve tests - add files
Finish layout and routes