LP#1787479: More layout changes