Fix layout bug 3