Usability: Template and top bar fixes to address usability testing results