Layout alignment fixes