Better grouping of tab settings
Improved comments