More tab content fixes