massive updates

Correct images, modal popup, and more!