Add Google Map by Roy, Fixed Issues