And an additional layout tweak