Added support for Radio buttons and added more questions