Much better fix for xmargin issues