Reorder samples
Bugfix localstorage state saving