Moved parts of state draw() to Field