fix some bug, remove Map button