Taxon edit form layout tidyup

Fixes #3042