Fixed shuffling views. Works great :)