Game Controller dialog fixes

Fixes #8 and addresses #9 better than before.