Code cleaned up, UI enhancements, map view operations updated