Clean up confusing class names
Select scene object with popup instead of drop down