Menu refactoring
Place single output gates in one pattern