Layout changes. Comments added
Stream and Viewer updated