Perform minor layout fixes