Tweak geo-location and adding more canvas implementation