NR-953 : Aloha editor - fix toolbar

integrated aloha's ui-a-la-carte branch