cell toolbar and modal dialog fixes

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

prevented edit metadata from working properly.

closes #6124