refactor modal stuff
refactor shortcut keys