Fixed multiple grid issues, implemented undo / redo