big layout improvements, everything looks good, including margins