gonna make some changes
map page working