Gpii 196 - lots of small styling fixes.

Lots of styling fixes. Combines work from GPII-200 too.