Refactored radio buttons and added update on toggle