Fix layout Issue 3