Expandable categories + minor tweaks
Modification of some descriptions