diff --git a/Private/Invoke.GPOZaurrAnalysis.ps1 b/Private/Invoke.GPOZaurrAnalysis.ps1
index b7e2f18..d1e828c 100644
--- a/Private/Invoke.GPOZaurrAnalysis.ps1
+++ b/Private/Invoke.GPOZaurrAnalysis.ps1
@@ -1,9 +1,9 @@
 $GPOZaurrAnalysis = [ordered] @{
-    Name       = 'GPO Permissions Consistency'
+    Name       = 'Group Policy Content'
     Enabled    = $true
     Data       = $null
     Execute    = {
-        $GPOContent = Invoke-GPOZaurrContent
+        Invoke-GPOZaurrContent
     }
     Processing = {
 
@@ -15,9 +15,9 @@
 
     }
     Solution   = {
-        foreach ($Key in $GPOContent.Keys) {
+        foreach ($Key in $GPOZaurrAnalysis['Data'].Keys) {
             New-HTMLTab -Name $Key {
-                New-HTMLTable -DataTable $GPOContent[$Key] -Filtering -Title $Key
+                New-HTMLTable -DataTable $GPOZaurrAnalysis['Data'][$Key] -Filtering -Title $Key
             }
         }
     }
diff --git a/Private/Invoke.GPOZaurrFiles.ps1 b/Private/Invoke.GPOZaurrFiles.ps1
index 9ff3a7c..f6d85f3 100644
--- a/Private/Invoke.GPOZaurrFiles.ps1
+++ b/Private/Invoke.GPOZaurrFiles.ps1
@@ -1,10 +1,10 @@
 $GPOZaurrFiles = [ordered] @{
-    Name       = 'GPO Permissions Consistency'
+    Name       = 'SYSVOL (NetLogon) Files List'
     Enabled    = $true
     Data       = $null
     Execute    = {
-        $GPOFiles = Get-GPOZaurrFiles
-     }
+        Get-GPOZaurrFiles
+    }
     Processing = {
 
     }
@@ -15,6 +15,6 @@
 
     }
     Solution   = {
-        New-HTMLTable -DataTable $GPOFiles -Filtering
+        New-HTMLTable -DataTable $GPOZaurrFiles['Data'] -Filtering
     }
 }
\ No newline at end of file
diff --git a/Private/Invoke.GPOZaurrOrphans.ps1 b/Private/Invoke.GPOZaurrOrphans.ps1
index f92ec7f..796e126 100644
--- a/Private/Invoke.GPOZaurrOrphans.ps1
+++ b/Private/Invoke.GPOZaurrOrphans.ps1
@@ -1,5 +1,5 @@
 $GPOZaurrOrphans = [ordered] @{
-    Name       = 'Orphaned GPO (SysVol or Active Directory)'
+    Name       = 'Orphaned Group Policies'
     Enabled    = $true
     Data       = $null
     Execute    = {
diff --git a/Private/Invoke.GPOZaurrOwners.ps1 b/Private/Invoke.GPOZaurrOwners.ps1
index 569a00f..cd7d807 100644
--- a/Private/Invoke.GPOZaurrOwners.ps1
+++ b/Private/Invoke.GPOZaurrOwners.ps1
@@ -1,5 +1,5 @@
 $GPOZaurrOwners = [ordered] @{
-    Name       = 'GPO Owners'
+    Name       = 'Group Policy Owners'
     Enabled    = $true
     Data       = $null
     Execute    = { Get-GPOZaurrOwner -IncludeSysvol }
diff --git a/Private/Invoke.GPOZaurrPermissions.ps1 b/Private/Invoke.GPOZaurrPermissions.ps1
index da9757b..a02f4c0 100644
--- a/Private/Invoke.GPOZaurrPermissions.ps1
+++ b/Private/Invoke.GPOZaurrPermissions.ps1
@@ -1,10 +1,9 @@
 $GPOZaurrPermissions = [ordered] @{
-    Name       = 'GPO Permissions'
+    Name       = 'Group Policy Permissions'
     Enabled    = $true
     Data       = $null
     Execute    = {
-        $GPOPermissions = Get-GPOZaurrPermission -Type All -IncludePermissionType GpoEditDeleteModifySecurity, GpoEdit, GpoCustom -IncludeOwner
-
+        Get-GPOZaurrPermission -Type All -IncludePermissionType GpoEditDeleteModifySecurity, GpoEdit, GpoCustom #-IncludeOwner
     }
     Processing = {
 
@@ -16,6 +15,6 @@
 
     }
     Solution   = {
-
+        New-HTMLTable -DataTable $GPOZaurrPermissions['Data'] -Filtering
     }
 }
\ No newline at end of file
diff --git a/Private/Invoke.GPOZaurrPermissionsRoot.ps1 b/Private/Invoke.GPOZaurrPermissionsRoot.ps1
index db68f96..31e65c6 100644
--- a/Private/Invoke.GPOZaurrPermissionsRoot.ps1
+++ b/Private/Invoke.GPOZaurrPermissionsRoot.ps1
@@ -1,10 +1,10 @@
 $GPOZaurrPermissionsRoot = [ordered] @{
-    Name       = 'GPO Permissions Consistency'
+    Name       = 'Group Policies Root Permissions'
     Enabled    = $true
     Data       = $null
     Execute    = {
-        $GPOPermissionsRoot = Get-GPOZaurrPermissionRoot -SkipNames
-     }
+        Get-GPOZaurrPermissionRoot -SkipNames
+    }
     Processing = {
 
     }
@@ -15,6 +15,6 @@
 
     }
     Solution   = {
-        New-HTMLTable -DataTable $GPOPermissionsRoot -Filtering
+        New-HTMLTable -DataTable $GPOZaurrPermissionsRoot['Data'] -Filtering
     }
 }
\ No newline at end of file
diff --git a/Private/Invoke.GPOZaurrSysVolLegacyFiles.ps1 b/Private/Invoke.GPOZaurrSysVolLegacyFiles.ps1
index 6feb414..5b403b8 100644
--- a/Private/Invoke.GPOZaurrSysVolLegacyFiles.ps1
+++ b/Private/Invoke.GPOZaurrSysVolLegacyFiles.ps1
@@ -3,8 +3,8 @@
     Enabled    = $false
     Data       = $null
     Execute    = {
-        $ADMLegacyFiles = Get-GPOZaurrLegacyFiles
-     }
+        Get-GPOZaurrLegacyFiles
+    }
     Processing = {
 
     }
@@ -15,6 +15,6 @@
 
     }
     Solution   = {
-
+        New-HTMLTable -DataTable $GPOZaurrSysVolLegacyFiles['Data'] -Filtering
     }
 }
\ No newline at end of file
diff --git a/Public/Invoke-GPOZaurr.ps1 b/Public/Invoke-GPOZaurr.ps1
index d641b62..ac5374b 100644
--- a/Public/Invoke-GPOZaurr.ps1
+++ b/Public/Invoke-GPOZaurr.ps1
@@ -4,14 +4,6 @@
     param(
         [string] $FilePath,
         [string[]] $Type
-        <#
-        [ValidateSet(
-            'GPOList', 'GPOOrphans', 'GPOPermissions', 'GPOPermissionsRoot', 'GPOFiles',
-            'GPOConsistency', 'GPOOwners', 'GPOAnalysis',
-            'NetLogon',
-            'LegacyAdm'
-        )][string[]] $Type
-        #>
     )
     Reset-GPOZaurrStatus # This makes sure types are at it's proper status
 
@@ -53,12 +45,14 @@
     }
 
     # Lets disable all current ones
-    foreach ($T in $Script:GPOConfiguration.Keys) {
-        $Script:GPOConfiguration[$T].Enabled = $false
-    }
-    # Lets enable all requested ones
-    foreach ($T in $Type) {
-        $Script:GPOConfiguration[$T].Enabled = $true
+    if ($Type) {
+        foreach ($T in $Script:GPOConfiguration.Keys) {
+            $Script:GPOConfiguration[$T].Enabled = $false
+        }
+        # Lets enable all requested ones
+        foreach ($T in $Type) {
+            $Script:GPOConfiguration[$T].Enabled = $true
+        }
     }
 
     foreach ($T in $Script:GPOConfiguration.Keys) {
@@ -75,7 +69,7 @@
 
     # Generate pretty HTML
     Write-Verbose "Invoke-GPOZaurr - Generating HTML"
-    New-HTML {
+    New-HTML -Author 'Przemysław Kłys' -TitleText 'GPOZaurr Report' {
         New-HTMLTabStyle -BorderRadius 0px -TextTransform capitalize -BackgroundColorActive SlateGrey
         New-HTMLSectionStyle -BorderRadius 0px -HeaderBackGroundColor Grey -RemoveShadow
         New-HTMLPanelStyle -BorderRadius 0px
@@ -87,7 +81,7 @@
                     New-HTMLText -Text "Report generated on $(Get-Date)" -Color Blue
                 } -JustifyContent flex-start -Invisible
                 New-HTMLSection {
-                    New-HTMLText -Text $Script:Reporting['Version'] -Color Blue
+                    New-HTMLText -Text "GPOZaurr - $($Script:Reporting['Version'])" -Color Blue
                 } -JustifyContent flex-end -Invisible
             }
         }
@@ -95,18 +89,14 @@
         if ($Type.Count -eq 1) {
             foreach ($T in $Script:GPOConfiguration.Keys) {
                 if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
-                    if ($Script:GPOConfiguration[$T]['Data']) {
-                        & $Script:GPOConfiguration[$T]['Solution']
-                    }
+                    & $Script:GPOConfiguration[$T]['Solution']
                 }
             }
         } else {
             foreach ($T in $Script:GPOConfiguration.Keys) {
                 if ($Script:GPOConfiguration[$T].Enabled -eq $true) {
-                    New-HTMLTab -Name $T {
-                        if ($Script:GPOConfiguration[$T]['Data']) {
-                            & $Script:GPOConfiguration[$T]['Solution']
-                        }
+                    New-HTMLTab -Name $Script:GPOConfiguration[$T]['Name'] {
+                        & $Script:GPOConfiguration[$T]['Solution']
                     }
                 }
             }