Dashed border on hover for editing
dashed border on hover for edit. Merge conflicts resolved