Fix AchievementScreen and NewAchievementDialog