Some fixes. Grid now implemented