Merge branch 'Adding-Control-View'