Test fix.  Layout tweaks.