Radio buttons and fixes