Annotation bugs

Add protection for unauthorized deletions/updates.
Show correct buttons.