Update some layout stuff and fix the routes