Reordered js files
Cleaned up form submit