Some minor changes to the form