Fixed shuffle and added visabilty functionality