Cleaned up js files
Fixed form and adjusted formatting on modal
merging before push