A little bit better UI for data filling