Cleaned up some JS
Fixed the form