[DO NOT MERGE] 642 add form name edit functionality

indentation issues