Add shuffle and loop buttons.
Minor, cleanup