map screen rotate fix, minor refactoring