Various minor layout related changes