Beacons tray UI update (not finished)
Master branch merge
Changed beacons UI