MSRE - Fix 'and' handling, change form layout

'and' handling in the original MSRE was very broken.  Now fixed to do
the right thing.

Form layout changed to give a line for the 'action' which could be much
longer than a simple 'yes' or 'no'