LPS-44911

Heya Brian, my fix actually broke some of the tabs, I will have to resend with a different fix