Layout fixes/changes/additions.