Getting rid of the "More" drop-down menu on the annotation

This change gets rid of the "More" drop down menu and instead replaces it with the edit and delete buttons. 

This is a fix for GitHub issue #476.