more tweaks for layout