Fix layout weirdness