More work on new entry form & table