LIB001-606: Slight improvements to static pages