Stylesheet updates.
Merge branch 'master' into UM_local