Menubar and template fixes.