More general objects in grid and some minoe UI tweaks