Updated index values for radio buttons + cleanup