Fix layout errors