Usability: Template and menu plugin fixes to address usability testing results