Improve UI and remove potential for duplicate
beacons