Move navigation and messages into partials