STREAM-143 : Stream Wizard UI Updates