Second round of layout changes