Moved selectivizr, tidied up main.js, grid bug fix