Updates to AStorage and ARadiobutton and Manager