icon labels and other fixes