fixup some layout issues