Reindented code and disabled buttons on shuffle