add map list & reorganize map view
merge