Added user created option to relevant add annotations calls.
Fixed close button. 

Deleted a bit too much before.
Merge branch 'master' into matej/annotation-options