Merge pull request #2127 from Mark-de-Haan/master

Small annotator UI changes + handlebar implementation