Added shifts to map, and fixed viewing