Fix Layouts and NumericField