Bugfix + Coding Standards Stuff

This fixes a bug in the display of the customizer, plus it's got a first pass at some coding standards fixes.