Use NullTextField + misc changes