Tidying up the "pre fill" page. Fixes #1593