more layout improvements part2