New Music app, Shuffling and Radio challenges

Other than asking Suri to shuffle my library is there a button to push that will allow me to chose Genre or All songs and shuffle?

Is there a way to edit the Radio like I could do before the update? Since the update I have to chose one song and I can't auto exclude bands I don't want to hear on that station.

Tried in both iTunes and iPhone 6+

Thanks for any help or idea.