BaseMapLayer Additions + CurrentLocationButton Enhancement