Reorganize play dialog into two fieldsets
Fix typo
Add todos