Added scrolling to map and fixed persistence bug