Reorganize to have fewer tabs