Refactoring code from widgets
Merge branch 'develop' of github.com:opencb/jsorolla into develop