#819 Add toolbar to edit mode