update nav and stylesheet links in default template
merge dev