Made Location button optional through constructor
Updated for changes in photomap API