redesigned mapActivity to separate popup and mapitems entities