Added new controls

Added support for SurfaceView and Switch