Skip button added, shuffling algorithm adjusted