Fix layout bug 6