Refactor routes and tests. Stylish site
Finish layout and routes