Use correct check for null
Do not display radio buttons if it's not a PR
Use colors and icons