New layout.
Fix some routes.