Layout fixes.
Layout and build fixes.