Removed redundant logic from navbar template.
Changed form constructor macros to take a dictionary object of form data, rather than just a string.