Updated some template calls and fixed the header display.