Reverted margin fixes