Ensure callback is modal method
Fix dialog onKeyDown in text inputs
Replace separate templates with a single template