integrate map into main site
merge