Added a stream choosing window that allows you to specify a stream to put in an overlay. Also did some refactoring to the existing code