more layout changes boot 3 upgrade