added maps to the popcorn screen.
Hopefully merged all of our conflicts.