NR-953 : Aloha editor - fix toolbar

more work on replacing elements,