some more modification
Add map placeholder
modify index