Updated form layout

Reconfigured fields into a table layout