Some UI improvement in help parser
Merge branch 'develop'