650 ellipsis with tooltips

Closes #650 #385 
Sorry! Should have caught it, but this was just old code being re-indented.