menu structures and shortcuts reworked