Added container VC so stream player is always onscreen, other changes and improvements