And I would say Swiss-German is the principal language. Standard German is the official and written one. And Standard German must also be listed in the immigrant languages as in the last year many Germans have come to Switzerland. Those Germans do not speak and sometimes not even understand Swiss-German.
Switzerland is divided into "Cantons" that all have a name translated into the 4 official languages. For instance "Graubünden" is the same as "Grisons", "Grischun" or "Grigioni". You mentionned it once as 2 different Cantons. Each Canton has its official language. Some has 2, one has 3. French is the official language in Genève, Vaud, Jura, Neuchâtel. It's co-official language with German in Fribourg, Bern and Valais. You didn't mention Valais and Bern in the French section when you listed the Cantons where it is spoken.