Window Manager control / Label alignment fixes