Updated button title upon switching views; Added annotations to the map.