Fixed sorting issue and adding a tab