Separate the States (and also Dialogues) into their own package.
Downloading High Scores: make the Scores Dialog always start from appropriate tab
Improvements