some fixup to layout