cell toolbar and modal dialog fixes

- name conflict in modal
- cell.cell_type in cell toolbar

prevented edit metadata from working properly.
Merge pull request #6127 from minrk/fix-edit-md

cell toolbar and modal dialog fixes