Revert "Revert "Revert "Revert "Finish layout and routes""""

This reverts commit eba084a03ee13fe6a90480817791d53f497bfdf7.
Revert "Revert "Revert "Revert "Revert "Finish layout and routes"""""

This reverts commit 26e80641c8b24eeb96cefbfc39a21cc18483afea.
Revert "Revert "Revert "Revert "Revert "Revert "Finish layout and routes""""""

This reverts commit bf843c210da219161e90ae181195bfd1a49023da.
Finish layout and routes