Polished map stuff, changed some icons