Fix layout and working copy