Fixed github issues 478 and 476.

Fixed issues 478 and 476. I went for the simple fix of commenting out the "more" button and adding edit and delete buttons. 

Now it looks like this:
![newannotationmenu](https://f.cloud.github.com/assets/521978/763133/701894e6-e7f8-11e2-9bae-405b7c5a71ed.jpg)