Added check for object already being there
Fixed controls showing when nothing is selected