YH-122 basic changes to form layout
YH-122 basic changes to form layout this time with templates