Cleaned Up More

Cleaned up Map, MapPopup, MainActivity