Fix export and minor layout