Class margin is reworked