moved locationpublisher to locationservice inner class, added some buttons/strings