moderate cleanup and css namespacing of controls, improved demo page layout slightly