Refactored beacon code
Works! But labels are stacked on each other