Enhance som stuff on module website and admin
Merge pull request #702 from loiccouturier/master

Enhance some stuff on module website and admin