Layout updates. Fixed some routes.