DO NOT MERGE - working commit only - add form view and button listener

DO NOT MERGE