Make label tag for equal to radio button id

Fixes #4561
Fix issue where deleted variants do not show up in admin when requesting deleted variants

Fixes #4562
Improve code indentation. It was hard to read before.

Signed-off-by: Jaime Victoria <jaime.victoria@crowdint.com>

Fixes #4568