More refactoring, created new maps activity