Minor changes to form