Added layout to forms