[ISSUE: AV-5] Label is now clickable