Move navigation and error messages into partials