3.9.1 revised tabs annotation plugin

Making the annotations buttons behave like 508 buttons
Michal, please merge