Changes to remove streams page, add non-dvr option