Update modules.css
fix conflicts from shash pull request
Merge branch 'shash66-master'
merge shash css updates