Some modifications for tabs