Margin figures moved to below question text

.. some more still need to be done