Improve layouts and stylesheets
Finish layout and routes