Sort out tab issues