Navigation bugfix, template update