Fixed shuffling bug and "Loading" message