Stuff moved to grid

Will add some stuff back when possible