Correct some issues with page forms and navigation menu