fix some stuff on Components gadget
Merge branch 'master' of github.com:jaws-project/jaws
tail of last commit