MFP4: Merge new layout
Submitted by: Emily Boyd <emilyboyd@emilyboyd.com> Sponsored by: Google Summer of Code 2005