moved custom batch navigation to macro in hwccontent, refs #8953
updated theme