ControlView and Calltaker changes added