Latest changes

Implementation of resolveEvent for the menus