fixing css
overriding bootstrap
Merge branch 'master' into dashboard