Added locationlistener and maps