database / pyramid work...
minor rearrangements
popup added to map...