Corrected the @m problem in SF bug 3053182.
Some layout changes.
Authored by: simonjwright 2010-08-25
Parent: [r70]
Child: [r72]