Margin figures moved to below question text

.. some more still need to be done
Merge pull request #781 from abhinavc/master

Margin figures brought below part 1