further menu  & Trigger refactor