FIX: integrated minor changes from production version.
FIX: applying a first set of HTML fixes (as reported from w3c validator).