Fixed shuffle/added view all functionality