Simplify the navigation code

Form sections are now modelled explicitly with a class.