improvements on tabs