Added shuffling method to the card collection
Navigation refactor