updated the MainToolbar and the ThumbsToolbar to be more inline with BH prject