Yet a few layout bugfixes