Fix TW for new margins