redo tabs since the tabs break when using nested modals
Merge pull request #1364 from jay-hodgson/SWC-1983

SWC-1983: redo tabs since the tabs break when using nested modals