Finished layout and routes
Revert "Finished layout and routes"

This reverts commit d524e024ec0572123737e78753aceb538286c501.
Layout finito
Revert "Revert "Finished layout and routes""

This reverts commit 392d93f22365e5039f4d767bb3009a0426030257.