Layout tweaks

Several layout fixes.