More layout changes. And there will be even more!