some css upgrades
Finish layout and routes