add canccel button to mapActivity and some bugfixing