Updated code to have simple form view