added mousetrap for handling shortcuts
merge