Updated for iPhone 6, map zoom and refactoring