Added more fixes and also the streaming widget