Fixed rest of modal window issues.