Template review - Fixes for nav andheader