Views added, controller changed

Change-Id: I0a53534592c512c9bf23c69de1f0403ac63a5131