Reverting some margin changes