more templating working and nav bug fix