Fix layout and dependency