new layout
Streams added
Streams add + small fix