Small cleanup + give XP Gapps Center its own header and preference.