*8707* Label alignment fixes