This fixes SF bug #495896. Fix up various markup consistency & style guide conformance nits.
Attach a file by drag & drop or click to upload
