Secure Maps and Map Updates

Fixed error with view and updated the maps completely.