added map UI, functional, part2