Added more forms, passing form data between views
Minor improvements