Added radio icons, improved functionality