kevin's modal updates. added a few and changed styles
merge conflict