tweaked a couple of styles for madal
Merge branch 'dev'