Some changes; Merged from 'b-tabs'