better layout fix