Fix the modal. Third time. Plus some other things as well.