Various minor layout fixes.