Fixing some templates and navigation issues.