split up markup for the two forms to make things a bit clearer