Further tabs updates