Updated map controls and javascript functions