Refactor labels to include live-indicator