Base: Fix radio buttons not highlighting correctly