Added options to select stream location and live/dvr streams