Move NumericBox and TextBox to one class