Added buttons for annotations. Small fixes.