Layout changes part2.