Further tweaking of layout and packing.