Form re-population

Just some minor tweaking to the form.