Actually fix the timing issue and clean up the difficulty dialog