S2 View Change: Form with Input Fields

Change-Id: I74bf44488e2b2f062940abb1129908d7d5048998