Fix shuffle button on state
Add a few more hot keys