Added user, location and bubble templates for viewing/editing.