tabui crash fix, gaps & re-order

Change-Id: I6e577b5b4c5cdf4156a1aa95653dad22dfd66c97