Moved control bar into template, and also adjusted what controls are shown for points annotation set vs whole image