Fix layout and add pin