Fix margin problem, Number field problem