build menu works with edit mode better