fixes to contextmenu + added shortcuts - close #492