Moved grid and stuff about