Made some fixes with Map and Trophies Activities