Now moves map and fixed one selection bug