styling WIP
refactoring WIP
Finish layout and routes