Made shuffle button wider, added a TODO