Fix unbalanced HTML
Cleanups to form navigation