Streaming is working, layout needs to be changed