Created some new stuff, fixed grid