Incorporated Lauren's question generator changes

Also fixes the overlap issue with infoboxes in MapPanel