Cleaning up some stuff, adding grid system