minor ui and woring fixes from Arndis