Template review - Fixes for nav and header