Added switch to change between recording and streaming views