Complete grid, redone drag/drop mechanism