Update for B7

One redesign needed usability testing, updated to reflect