Think this would be a nice UX improvement. Not sure if I have missed how this can be done at present but it would be nice to be able to have all data entry on one page to avoid multiple clicks. e.g. 