updated forms and edited layout