Merge with newest map.jsp & Fix display error of map.jsp