Adding question counter see BT#7371
Minor - minor format code.
Some updates from 1.9.x
Commenting code not used.
Fixing margin see BT#7371
Updating from 1.9.x