Fix forms and modal formatting