Save and restore shuffle state

Moved shuffle state into the root item to be able to save