refactor layouts and css
Finish layout and routes