App configuration context added.
Simplyfied the managment of the radio buttons selection.
Deleted obolete code.