Finish modal refactor.