tweaked some JS

still need to get Grid optomized