Started work on simplifying navigating through the form.