moved map methods to MapFragm

+ improved MainActivity logic