simplified the form creating logic
change the layout