Add change player screen
Fix stylecop warnings