Learning switch minor UI fixes