General fixes + modal select fix
Merge branch 'master' of https://github.com/mxaGianluca/stylesuite_dev