Layout tweaks
Minor flow changes.