Revised the design of the forms