fix bootstrap related issues
merge branch 'master' into adaptors
improve css classes