Changed some things in the layout.
Changed stream blocks
Fixed merge conflicts