Fixes issue #34 and with some minor improvements to overall default form display.