Fixed stream buttons workflow