Added in some javascript, cleaned up main.js
Made a few modifications to the grid options