fix some bugs, add map tab and finish nearby