More work on entry form