Added radio selection box
Layout improvmements
Fixed some event related bugs