shuffle button, responsive design fixed
fix merge