several minor UI improvements
fix #22691