Bit more cleanup to fix background colors and setup for the tabs
actually changing content.