Update UI and add 'Suffle' button
Clean up UI, etc
Change a TODO to a FIXME