Resolve even for buttons and menus

not there yet but getting closer