Improved: Tab reordering