[ADD] sort_tab layout
[FIX] sort tabs text color change
[FIX] Merge resolve conflict