fixed modals, began code on forms