Replaced the radio button implementation into a button

[sivaraam]

This simplifies the radio button implementation hugely.The border is highlighted instead of the radio. Looks good to me 😄