Fix/clean up play dialog