Config sorting fix and tab partial