Changed unit selection method to toggle