-Change insert convention
-Fix keys getting ignored by dialogs