Finish layout and routes
Revert "Finish layout and routes"

This reverts commit 74ec16ac29c53b32da1a9fcc37bcb267122f07d1.
Revert "Revert "Finish layout and routes""

This reverts commit 0854bcc4e1b91c2ca728bc63dea7bcfd4549a46c.
Revert "Revert "Revert "Finish layout and routes"""

This reverts commit 566f0ceda92411333dc41d193519853e39137b3a.