added form and label layout