Fixes #2389 : Softwares tab renamed to Software
Fixes #2399
Fixes #2391