Finalize full reg modal, polish full/express reg modals, refactor