Updated so navs work
Templates