Layout and planning tweaks.