Clean up object selection, fix grid reso