diff --git a/content.js b/content.js
index 6ca5e6c..14cd0bd 100644
--- a/content.js
+++ b/content.js
@@ -2,7 +2,8 @@ class MessagingService {
 
   async GetHyperlinkNodes(sender, callback) {
     const a = this;
-    const nodes = await document.body.getElementsByTagName("a");
+    const nodes = await document.querySelectorAll("a");
+
     let result = [];
 
     for (let i=0; i<nodes.length; i++) {
@@ -18,16 +19,13 @@ class MessagingService {
       });
     }
 
-    // for (let i=0; i<result.length; i++) {
-    //   result[i].occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
-    // }
-
     await callback(result);
   }
 
   async GetImageNodes(sender, callback) {
     const a = this;
-    const nodes = await document.body.getElementsByTagName("img");
+    const nodes = await document.querySelectorAll("img");
+
     let result = [];
 
     for (let i=0; i<nodes.length; i++) {
@@ -49,6 +47,41 @@ class MessagingService {
     callback(document.location.href);
   }
 
+  async GetMetaNodes(sender, callback) {
+    const a = this;
+    const nodes = await document.querySelectorAll("meta");
+
+    let result = [];
+
+    for (let i=0; i<nodes.length; i++) {
+      result.push({
+        content: (nodes[i].getAttribute("content") ?? ""),
+        name: (nodes[i].getAttribute("name") ?? ""),
+        httpEquiv: (nodes[i].getAttribute("http-equiv") ?? ""),
+        occurrence: 1
+      });
+    }
+
+    await callback(result);
+  }
+
+  async GetScriptNodes(sender, callback) {
+    const a = this;
+    const nodes = await document.querySelectorAll("script");
+
+    let result = [];
+
+    for (let i=0; i<nodes.length; i++) {
+      result.push({
+        src: (nodes[i].getAttribute("src") ?? ""),
+        type: (nodes[i].getAttribute("type") ?? ""),
+        occurrence: 1
+      });
+    }
+
+    await callback(result);
+  }
+
   #encodeHtml(htmlContent) {
     const map = {
         "&": "&amp;",
@@ -78,13 +111,4 @@ chrome.runtime.onMessage.addListener(async function(request, sender, callback) {
 
   await messageService[request.event](sender, callback);
 
-});
-
-
-
-
-// var optHideWatchedVideos = new Promise(function(resolve) {
-//   chrome.storage.local.get(['switch1'], function(result) {
-//     resolve(result.switch1);
-//   });
-// });
+});
\ No newline at end of file
diff --git a/popup.dist.js b/popup.dist.js
index 413e633..60b9eaf 100644
--- a/popup.dist.js
+++ b/popup.dist.js
@@ -3,4 +3,4 @@
   * Copyright 2024-2024 Ray Lam (https://www.hiimray.co.uk)
   *
   */
-!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.PejiInspektor=t():e.PejiInspektor=t()}(this,(()=>(()=>{var e={645:function(e){var t;t=()=>(()=>{var e={814:()=>{Array.isEmpty=function(e){return"array"!=Object.getDataType(e)||e.length<=0},Array.toFlatten=function(e,t,n){for(let r=0;r<e.length;r++)n.push(e[r]),null!=typeof e[r][t]&&e[r][t].length>0&&Array.toFlatten(e[r][t],t,n)},Array.prototype.addRange=function(e){return null==e||e.forEach((e=>{this.push(e)})),this},Array.prototype.all=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]!=t)return!1}else if(void 0!==this[n][e]&&this[n][e]!=t)return!1;return!0},Array.prototype.any=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]==t)return!0}else if(void 0!==this[n][e]&&this[n][e]==t)return!0;return!1},Array.prototype.copy=function(){return JSON.parse(JSON.stringify(this))},Array.prototype.count=function(e,t){let n=0;for(let r=0;r<this.length;r++)null==e?this[r]==t&&n++:void 0!==this[r][e]&&this[r][e]==t&&n++;return n},Array.prototype.countMany=function(...e){let t=0;return e.forEach((e=>{t+=this.count(e.propName,e.value)})),t},Array.prototype.create=function(e,t){let n=[];for(let r=0;r<e;r++)n.push(t);return n},Array.prototype.distinct=function(){return this.filter(((e,t,n)=>t===n.findIndex((t=>JSON.stringify(t)===JSON.stringify(e)))))},Array.prototype.flatten=function(e){let t=[];return Array.toFlatten(this,e,t),t},Array.prototype.get=function(e){return e<0||e>=this.length?"":this[e]},Array.prototype.index=function(e,t){const n=this.indexes(e,t);return n.length<=0?null:n[0]},Array.prototype.indexes=function(e,t){let n=[];for(let r=0;r<this.length;r++)null==e?this[r]==t&&n.push(r):void 0!==this[r][e]&&this[r][e]==t&&n.push(r);return n},Array.prototype.insert=function(e,t){return e<0?this.splice(0,0,t):e>=this.length?this.push(t):this.splice(e,0,t),this},Array.prototype.joinIfNotNullOrWhitespace=function(e){let t="";for(let n=0;n<this.length;n++)String.isNullOrWhitespace(this[n])||(String.isNullOrWhitespace(t)||(t+=e),t+=this[n]);return t},Array.prototype.first=function(e,t){for(let n=0;n<this.length;n++)if(void 0!==this[n][e]&&this[n][e]==t)return this[n];return null},Array.prototype.forEachTree=function(e,t){for(let n=0;n<this.length;n++){if(!1===t(this[n]))return;if(!(this[n][e].length<=0)&&!1===this[n][e].forEachTree(e,t))return}},Array.prototype.orderBy=function(e){return this.sort((function(t,n){return t[e]<n[e]?-1:t[e]>n[e]?1:0})),this},Array.prototype.orderByDesc=function(e){return this.sort((function(t,n){return t[e]<n[e]?1:t[e]>n[e]?-1:0})),this},Array.prototype.remove=function(e){let t=[];for(let n=0;n<this.length;n++)this[n]==e&&t.push(n);for(let e=t.length-1;e>=0;e--)this.removeAt(t[e]);return this},Array.prototype.removeAt=function(e){return e<0||e>=this.length||this.splice(e,1),this},Array.prototype.removeRange=function(e){for(let t=0;t<e.length;t++)this.remove(e[t]);return this},Array.prototype.notSelect=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]!=t&&n.push(this[r]);return n},Array.prototype.select=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]==t&&n.push(this[r]);return n},Array.prototype.selectMany=function(...e){let t=this;return e.forEach((e=>{t=t.select(e.propName,e.value)})),t},Array.prototype.toList=function(e){let t=[];return this.forEach((n=>{null!=typeof n[e]&&t.push(n[e])})),t},Array.prototype.sortTree=function(e,t){this.orderBy(t);for(let n=0;n<this.length;n++)this[n][e].length<=0||this[n][e].orderBy(t)}},523:()=>{Boolean.isFalse=function(e){return!!String.isNullOrUndefined(e)||e.toString().containsCI("false","f","y","0","x")},Boolean.isTrue=function(e){return!String.isNullOrUndefined(e)&&e.toString().containsCI("true","t","n","1","o")},Boolean.ifTrue=function(e,t,n){return Boolean.isTrue(e)?t:n}},579:()=>{Date.addDays=function(e,t){let n=new Date(e);return n.addDays(t),n},Date.addMonths=function(e,t){let n=new Date(e);return n.addMonths(t),n},Date.addYears=function(e,t){let n=new Date(e);return n.addYears(t),n},Date.max=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(t):new Date(e)},Date.min=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(e):new Date(t)},Date.diffDays=function(e,t){return Math.ceil((new Date(t).getTime()-new Date(e).getTime())/864e5)},Date.today=function(){let e=new Date;return e.setHours(0),e.setMinutes(0),e.setSeconds(0),e.setMilliseconds(0),e},Date.prototype.addDays=function(e){this.setDate(this.getDate()+parseInt(e))},Date.prototype.addMonths=function(e){this.setMonth(this.getMonth()+parseInt(e))},Date.prototype.addYears=function(e){this.setFullYear(this.getFullYear()+parseInt(e))},Date.prototype.toCString=function(e){let t=e;return t=t.replace("fffffff",this.getMilliseconds().toString().padStart(7,"0")),t=t.replace("ffffff",this.getMilliseconds().toString().padStart(6,"0")),t=t.replace("fffff",this.getMilliseconds().toString().padStart(5,"0")),t=t.replace("yyyy",this.getFullYear().toString().padStart(4,"0")),t=t.replace("MMMM","{1}"),t=t.replace("dddd","{2}"),t=t.replace("ffff",this.getMilliseconds().toString().padStart(4,"0")),t=t.replace("yyy",this.getFullYear().toString().padStart(3,"0")),t=t.replace("MMM","{3}"),t=t.replace("ddd","{4}"),t=t.replace("fff",this.getMilliseconds().toString().padStart(3,"0")),t=t.replace("zzz",""),t=t.replace("yy",this.getFullYear().toString().slice(-2)),t=t.replace("MM",(this.getMonth()+1).toString().padStart(2,"0")),t=t.replace("dd",this.getDate().toString().padStart(2,"0")),t=t.replace("HH",this.getHours().toString().padStart(2,"0")),t=t.replace("hh",(this.getHours()>12?this.getHours()-12:this.getHours()).toString().padStart(2,"0")),t=t.replace("mm",this.getMinutes().toString().padStart(2,"0")),t=t.replace("ss",this.getSeconds().toString().padStart(2,"0")),t=t.replace("ff",this.getMilliseconds().toString().padStart(2,"0")),t=t.replace("tt","{5}"),t=t.replace("zz",""),t=t.replace("y",this.getFullYear().toString()),t=t.replace("M",(this.getMonth()+1).toString()),t=t.replace("d",this.getDate().toString()),t=t.replace("H",this.getHours().toString()),t=t.replace("h",(this.getHours()>12?this.getHours()-12:this.getHours()).toString()),t=t.replace("m",this.getMinutes().toString()),t=t.replace("s",this.getSeconds().toString()),t=t.replace("z",""),t=t.replace("t","{6}"),t=t.replace("Z",""),t=t.replace("{1}",this.toLocaleString("default",{month:"long"})),t=t.replace("{2}",this.toLocaleString("default",{weekday:"long"})),t=t.replace("{3}",this.toLocaleString("default",{month:"short"})),t=t.replace("{4}",this.toLocaleString("default",{weekday:"short"})),t=t.replace("{5}",this.getHours()>=12?"PM":"AM"),t=t.replace("{6}",this.getHours()>=12?"P":"A"),t}},874:()=>{Document.ready=async function(e){!async function(){"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",(function(){e()}))}()},Document.getWidth=function(e){return null==e||void 0===e?0:e.offsetWidth||e.innerWidth||e.clientWidth},Document.getHeight=function(e){return null==e||void 0===e?0:e.offsetHeight||e.innerHeight||e.clientHeight},Document.appendHtml=function(e,t){const n=document.createElement(t);e.appendChild(n)},Document.addClass=function(e,t){e.classList.contains(t)||e.classList.add(t)},Document.removeClass=function(e,t){e.classList.contains(t)&&e.classList.remove(t)}},705:()=>{Math.randomN=function(e,t){return e=Math.ceil(e),t=Math.floor(t),Math.floor(Math.random()*(t-e)+e)},Math.average=function(e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.avg=function(...e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.half=function(e){return e/2}},428:()=>{Object.isNullOrUndefined=function(e){return void 0===e||null==e},Object.getDataType=function(e){return String.isNullOrUndefined(e)?"null":"object"==typeof e?Array.isArray(e)?"array":"object":typeof e}},930:()=>{String.isNullOrUndefined=function(e){return void 0===e||null==e},String.isNullOrWhitespace=function(e){return!!String.isNullOrUndefined(e)||("string"==typeof e?e.trim().length<=0:e.toString().trim().length<=0)},String.joinIfNotNullOrWhitespace=function(e,...t){let n="";for(let r=0;r<t.length;r++)String.isNullOrWhitespace(t[r])||(String.isNullOrWhitespace(n)||(n+=e),n+=t[r]);return n},String.prototype.contains=function(...e){for(let t of e)if(this==t)return!0;return!1},String.prototype.containsCI=function(...e){for(let t of e)if(this.toLowerCase()==t.toLowerCase())return!0;return!1},String.prototype.encodeHtmlLinks=function(){return value.replace(/(http[s]{0,1}:\/\/[^\s]+)/g,"<a href='$1'>$1</a>")},String.prototype.toTitleCase=function(){let e=this;return e=e.replace(/([A-Z]{1})/g," $1"),e=e.trim(),e=e.charAt(0).toUpperCase()+e.substr(1),e},String.prototype.getFilename=function(){return this.substring(this.lastIndexOf("/")+1)}},323:()=>{Window.goToTop=function(){Window.scrollTo(0,0)},Window.fragment={get:function(){if(!window.location.hash)return null;const e=window.location.hash.indexOf("?");return e<0?window.location.hash.substring(1):window.location.hash.substring(1,e)},getQuery:function(){if(!window.location.hash)return null;let e=window.location.hash;const t=e.indexOf("?");if(t<0)return null;e=hasQueryString.substring(t+1);const n=new URLSearchParams(e),r={};for(const[e,t]of n.entries())r[e]=t;return r},clear:function(){location.hash="",history.replaceState("","",location.pathname)}}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var r={};return(()=>{"use strict";n.r(r),n(814),n(523),n(579),n(874),n(705),n(428),n(930),n(323)})(),r})(),e.exports=t()}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r].call(i.exports,i,i.exports,n),i.exports}return(()=>{"use strict";n(645);const e=class{GenerateCheckBox(e,t,n){let r="";return r+='<div class="form-check form-switch">',r+='<input class="form-check-input" type="checkbox" role="switch" id="checkbox'+e+'" name="checkbox'+e+'" '+(n?"checked":"")+">",r+='<label class="form-check-label" for="checkbox'+e+'">'+t+"</label>",r+="</div>",r}GenerateCols(...e){let t="";for(let n=0;n<e.length;n++)t+='<div class="col">'+e[n]+"</div>";return t}GenerateCSVLine(e,...t){1===t.length&&"array"==Object.getDataType(t[0])&&(t=t[0]);let n="";for(let r=0;r<t.length;r++)r>0&&(n+=e),n+=t[r];return n}GenerateRadioBox(e,t,n,r,o){let i="";return i+='<div class="form-check">',i+='<input class="form-check-input" type="radio" name="radioGroup'+e+'" id="radioBox'+t+'" value="'+r+'" '+(o?"checked":"")+">",i+='<label class="form-check-label" for="radioBox'+t+'">'+n+"</label>",i+="</div>",i}GenerateRow(...e){const t=this;1===e.length&&"array"==Object.getDataType(e[0])&&(e=e[0]);let n="";for(let r=0;r<e.length;r++)n+=t.GenerateRowCell(e[r]);return"<tr>"+n+"</tr>"}GenerateRowCell(e){return'<td class=""><input type="text" class="display" readonly="readonly" value="'+e+'" /></td>'}SetHtml(e,t){null!=e&&(e.innerHTML=t)}},t=new class{async SendMessage(e,t){chrome.tabs.query({active:!0,currentWindow:!0},(function(n){chrome.tabs.sendMessage(n[0].id,{event:e},t)}))}async GetHyperlinks(){const e=this;return new Promise((function(t){e.SendMessage("GetHyperlinkNodes",(async function(e){t(e.copy())}))}))}async GetImages(){const e=this;return new Promise((function(t){e.SendMessage("GetImageNodes",(async function(e){t(e.copy())}))}))}async GetLocation(){const e=this;return new Promise((function(t){e.SendMessage("GetLocation",(function(e){t(e)}))}))}},r=new class extends e{#e=null;#t=null;constructor(e){super(),this.#t=e}InitialiseComponents(){const e=this;e.Clear(),e.#n(),e.#r(),e.Button1.addEventListener("click",(async function(t){e.Button2.disabled=!0,e.TextBox1.value="",await e.Search(),e.Button2.disabled=!1})),e.Button2.addEventListener("click",(async function(t){e.Button2.disabled=!0,await e.Search(),e.Button2.disabled=!1}))}#n(){const e=this;let t="";t+=e.GenerateCheckBox(1,"Show Anchor as HTML",!1),t+=e.GenerateCheckBox(4,"Resolve Relative URL",!1);let n="";n+=e.GenerateCheckBox(3,"Sort By Anchor Text",!0),n+=e.GenerateCheckBox(2,"Trim Anchor Text",!0);let r=e.GenerateCols(t,n);e.SetHtml(e.Panel1,r)}#r(){const e=this;let t="";t+=e.GenerateCheckBox(12,"Hide External Links",!0),t+=e.GenerateCheckBox(5,"Hide Duplicates",!0),t+=e.GenerateCheckBox(14,"Hide Blank Anchors",!0),t+=e.GenerateCheckBox(15,"Hide Blank Links",!0),t+=e.GenerateCheckBox(11,"Hide Fragments",!0),t+=e.GenerateCheckBox(13,"Hide Mailto/Tel",!0),t+=e.GenerateCheckBox(16,"Hide Javascript",!0);let n="";n+=e.GenerateCheckBox(6,"Show Title",!0),n+=e.GenerateCheckBox(7,"Show Target",!1),n+=e.GenerateCheckBox(8,"Show Rel",!1),n+=e.GenerateCheckBox(9,"Show Type",!1),n+=e.GenerateCheckBox(10,"Show Count",!1);let r=e.GenerateCols(t,n);e.SetHtml(e.Panel2,r)}get Button1(){return null==this.Container?null:this.Container.querySelectorAll("button")[0]}get Button2(){return null==this.Container?null:this.Container.querySelectorAll("button")[1]}get Container(){const e=this;return null==e.#e&&(e.#e=document.getElementById("nav-hyperlinks")),e.#e}get Label1(){return null==this.Container?null:this.Container.querySelectorAll("[role='label']")[0]}get MemoBox1(){return null==this.Container?null:this.Container.querySelectorAll("textarea")[0]}get Panel1(){return null==this.Container?null:this.Container.querySelectorAll("div[role='options']")[0]}get Panel2(){return null==this.Container?null:this.Container.querySelectorAll("div[role='filters']")[0]}get Table1(){return null==this.Container?null:this.Container.querySelectorAll("table")[0]}get TextBox1(){return null==this.Container?null:this.Container.querySelectorAll("input[role='textbox']")[0]}Clear(){const e=this;e.Table1.style.display="none",e.MemoBox1.style.display="none",e.SetHtml(e.Panel1,""),e.SetHtml(e.Panel2,"")}async Search(){const e=this;e.Label1.innerText="",e.Table1.style.display="none",e.MemoBox1.style.display="none";const t=await e.#t.GetHyperlinks(),n=t.length,r=await e.#o(t.copy());switch(r.length==n?e.Label1.innerText="Showing "+n+" result"+(1==n?"":"s"):e.Label1.innerText="Showing "+r.length+" of "+n+" result"+(1==n?"":"s"),e.#i(2)){case"table":e.#l(r);break;case"csv":e.#a(r);break;case"links":e.#s(r)}}async#o(e){const t=this,n=await t.#t.GetLocation(),r=new URL(n).hostname;let o=[];for(let i=0;i<e.length;i++){const l=e[i];if(t.#c(11)&&l.href.startsWith("#"))continue;if(t.#c(15)&&String.isNullOrWhitespace(l.href))continue;if(t.#c(13)&&(l.href.toLowerCase().startsWith("telno:")||l.href.toLowerCase().startsWith("mailto:")))continue;if(t.#c(16)&&l.href.toLowerCase().startsWith("javascript:"))continue;const a=new URL(l.href,n);if(t.#c(12)&&r!=a.hostname)continue;let s=t.#c(1)?l.innerHTML:l.innerText;if(t.#c(14)&&String.isNullOrWhitespace(s))continue;const c=t.#c(4)?a.href:l.href;if(t.#c(2)&&(s=s.trim()),!String.isNullOrWhitespace(t.TextBox1.value))if("anchor"==t.#i(1)){if(!s.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue}else if(!c.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue;o.push({text:s,href:c,title:t.#c(6)?l.title:"",target:t.#c(7)?l.target:"",rel:t.#c(8)?l.rel:"",type:t.#c(9)?l.type:"",occurrence:""})}if(t.#c(10)){let e=[];for(let t=0;t<o.length;t++){const n=o.filter((e=>JSON.stringify(e)===JSON.stringify(o[t]))).length;e.push(n)}for(let t=0;t<o.length;t++)o[t].occurrence=e[t]}return t.#c(5)&&(o=o.distinct()),t.#c(3)&&(o=o.orderBy("text")),o}#u(){const e=this,t=[{id:6,name:"Title"},{id:7,name:"Target"},{id:8,name:"Rel"},{id:9,name:"Type"},{id:10,name:"Count"}];let n="";n+="<th>Anchor Text</th>",n+="<th>Address</th>";for(let r=0;r<t.length;r++)e.#c(t[r].id)&&(n+="<th>"+t[r].name+"</th>");return n}#c(e){if(null==this.Container)return!1;const t=this.Container.querySelectorAll("input[name='checkbox"+e+"']");return!(t.length<=0)&&t[0].checked}#i(e){if(null==this.Container)return"";const t=this.Container.querySelectorAll("select[name='comboBox"+e+"']");return t.length<=0?"":t[0].value}#h(e){if(null==this.Container)return"";const t=this.Container.querySelectorAll("input[name='radioGroup"+e+"']:checked");return t.length<=0?"":t[0].value}#l(e){const t=this,n=t.Table1.querySelectorAll("thead")[0],r=t.Table1.querySelectorAll("tbody")[0];n.innerHTML="",r.innerHTML="",t.Table1.style.display="table",n.innerHTML="<tr>"+t.#u()+"</tr>";for(let n=0;n<e.length;n++){const o=e[n];let i=[o.text,o.href];t.#c(6)&&i.push(o.title),t.#c(7)&&i.push(o.target),t.#c(8)&&i.push(o.rel),t.#c(9)&&i.push(o.type),t.#c(10)&&i.push(o.occurrence),r.innerHTML+=t.GenerateRow(i)}}#a(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];let o=[r.text,r.href];t.#c(6)&&o.push(r.title),t.#c(7)&&o.push(r.target),t.#c(8)&&o.push(r.rel),t.#c(9)&&o.push(r.type),t.#c(10)&&o.push(r.occurrence),t.MemoBox1.value+=t.GenerateCSVLine("\t",o),t.MemoBox1.value+="\n"}}#s(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];t.MemoBox1.value+=t.GenerateCSVLine("\t",[r.href]),t.MemoBox1.value+="\n"}}}(t),o=new class extends e{#e=null;#t=null;constructor(e){super(),this.#t=e}InitialiseComponents(){const e=this;e.Clear(),e.#n(),e.#r(),e.Button1.addEventListener("click",(async function(t){e.Button2.disabled=!0,e.TextBox1.value="",await e.Search(),e.Button2.disabled=!1})),e.Button2.addEventListener("click",(async function(t){e.Button2.disabled=!0,await e.Search(),e.Button2.disabled=!1}))}#n(){const e=this;let t="";t+=e.GenerateCheckBox(203,"Sort By Source URL",!0),t+=e.GenerateCheckBox(204,"Resolve Relative URL",!1);let n="";n+=e.GenerateCheckBox(202,"Trim Alternate Text",!0);let r=e.GenerateCols(t,n);e.SetHtml(e.Panel1,r)}#r(){const e=this;let t="";t+=e.GenerateCheckBox(212,"Hide External Links",!1),t+=e.GenerateCheckBox(205,"Hide Duplicates",!0),t+=e.GenerateCheckBox(214,"Hide Blank Alternate Text",!1),t+=e.GenerateCheckBox(215,"Hide Blank Source URL",!0);let n="";n+=e.GenerateCheckBox(206,"Show Alternative Text",!0),n+=e.GenerateCheckBox(207,"Show Source Set",!1),n+=e.GenerateCheckBox(208,"Show Image Map",!1),n+=e.GenerateCheckBox(210,"Show Count",!1);let r=e.GenerateCols(t,n);e.SetHtml(e.Panel2,r)}get Button1(){return null==this.Container?null:this.Container.querySelectorAll("button")[0]}get Button2(){return null==this.Container?null:this.Container.querySelectorAll("button")[1]}get Container(){const e=this;return null==e.#e&&(e.#e=document.getElementById("nav-images")),e.#e}get Label1(){return null==this.Container?null:this.Container.querySelectorAll("[role='label']")[0]}get MemoBox1(){return null==this.Container?null:this.Container.querySelectorAll("textarea")[0]}get Panel1(){return null==this.Container?null:this.Container.querySelectorAll("div[role='options']")[0]}get Panel2(){return null==this.Container?null:this.Container.querySelectorAll("div[role='filters']")[0]}get Table1(){return null==this.Container?null:this.Container.querySelectorAll("table")[0]}get TextBox1(){return null==this.Container?null:this.Container.querySelectorAll("input[role='textbox']")[0]}Clear(){const e=this;e.Table1.style.display="none",e.MemoBox1.style.display="none",e.SetHtml(e.Panel1,""),e.SetHtml(e.Panel2,"")}async Search(){const e=this;e.Label1.innerText="",e.Table1.style.display="none",e.MemoBox1.style.display="none";const t=await e.#t.GetImages(),n=t.length,r=await e.#o(t.copy());switch(r.length==n?e.Label1.innerText="Showing "+n+" result"+(1==n?"":"s"):e.Label1.innerText="Showing "+r.length+" of "+n+" result"+(1==n?"":"s"),e.#i(2)){case"table":e.#l(r);break;case"csv":e.#a(r);break;case"links":e.#s(r)}}async#o(e){const t=this,n=await t.#t.GetLocation(),r=new URL(n).hostname;let o=[];for(let i=0;i<e.length;i++){const l=e[i];if(t.#c(215)&&String.isNullOrWhitespace(l.src))continue;const a=new URL(l.src,n);if(t.#c(212)&&r!=a.hostname)continue;if(t.#c(214)&&String.isNullOrWhitespace(l.alt))continue;const s=t.#c(204)?a.href:l.src,c=t.#c(202)?l.alt.trim():l.alt;if(!String.isNullOrWhitespace(t.TextBox1.value))if("alt"==t.#i(201)){if(!c.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue}else if(!s.toLowerCase().includes(t.TextBox1.value.toLowerCase()))continue;o.push({src:s,alt:t.#c(206)?c:"",srcset:t.#c(207)?l.srcset:"",usemap:t.#c(208)?l.usemap:"",occurrence:""})}if(t.#c(210)){let e=[];for(let t=0;t<o.length;t++){const n=o.filter((e=>JSON.stringify(e)===JSON.stringify(o[t]))).length;e.push(n)}for(let t=0;t<o.length;t++)o[t].occurrence=e[t]}return t.#c(205)&&(o=o.distinct()),t.#c(203)&&(o=o.orderBy("src")),o}#u(){const e=this,t=[{id:206,name:"Alternative Text"},{id:207,name:"Source Set"},{id:208,name:"Image Map"},{id:210,name:"Count"}];let n="";n+="<th>Source</th>";for(let r=0;r<t.length;r++)e.#c(t[r].id)&&(n+="<th>"+t[r].name+"</th>");return n}#c(e){if(null==this.Container)return!1;const t=this.Container.querySelectorAll("input[name='checkbox"+e+"']");return!(t.length<=0)&&t[0].checked}#i(e){if(null==this.Container)return"";const t=this.Container.querySelectorAll("select[name='comboBox"+e+"']");return t.length<=0?"":t[0].value}#l(e){const t=this,n=t.Table1.querySelectorAll("thead")[0],r=t.Table1.querySelectorAll("tbody")[0];n.innerHTML="",r.innerHTML="",t.Table1.style.display="table",n.innerHTML="<tr>"+t.#u()+"</tr>";for(let n=0;n<e.length;n++){const o=e[n];let i=[o.src];t.#c(206)&&i.push(o.alt),t.#c(207)&&i.push(o.srcset),t.#c(208)&&i.push(o.usemap),t.#c(210)&&i.push(o.occurrence),r.innerHTML+=t.GenerateRow(i)}}#a(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];let o=[r.src];t.#c(206)&&o.push(r.alt),t.#c(207)&&o.push(r.srcset),t.#c(208)&&o.push(r.usemap),t.#c(210)&&o.push(r.occurrence),t.MemoBox1.value+=t.GenerateCSVLine("\t",o),t.MemoBox1.value+="\n"}}#s(e){const t=this;t.MemoBox1.value="",t.MemoBox1.style.display="inline-block";for(let n=0;n<e.length;n++){const r=e[n];t.MemoBox1.value+=t.GenerateCSVLine("\t",[r.src]),t.MemoBox1.value+="\n"}}}(t);document.addEventListener("DOMContentLoaded",(async function(e){r.InitialiseComponents(),o.InitialiseComponents()}))})(),{}})()));
\ No newline at end of file
+!function(e,t){"object"==typeof exports&&"object"==typeof module?module.exports=t():"function"==typeof define&&define.amd?define([],t):"object"==typeof exports?exports.PejiInspektor=t():e.PejiInspektor=t()}(this,(()=>(()=>{var e={645:function(e){var t;t=()=>(()=>{var e={814:()=>{Array.isEmpty=function(e){return"array"!=Object.getDataType(e)||e.length<=0},Array.toFlatten=function(e,t,n){for(let r=0;r<e.length;r++)n.push(e[r]),null!=typeof e[r][t]&&e[r][t].length>0&&Array.toFlatten(e[r][t],t,n)},Array.prototype.addRange=function(e){return null==e||e.forEach((e=>{this.push(e)})),this},Array.prototype.all=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]!=t)return!1}else if(void 0!==this[n][e]&&this[n][e]!=t)return!1;return!0},Array.prototype.any=function(e,t){for(let n=0;n<this.length;n++)if(null==e){if(this[n]==t)return!0}else if(void 0!==this[n][e]&&this[n][e]==t)return!0;return!1},Array.prototype.copy=function(){return JSON.parse(JSON.stringify(this))},Array.prototype.count=function(e,t){let n=0;for(let r=0;r<this.length;r++)null==e?this[r]==t&&n++:void 0!==this[r][e]&&this[r][e]==t&&n++;return n},Array.prototype.countMany=function(...e){let t=0;return e.forEach((e=>{t+=this.count(e.propName,e.value)})),t},Array.prototype.create=function(e,t){let n=[];for(let r=0;r<e;r++)n.push(t);return n},Array.prototype.distinct=function(){return this.filter(((e,t,n)=>t===n.findIndex((t=>JSON.stringify(t)===JSON.stringify(e)))))},Array.prototype.flatten=function(e){let t=[];return Array.toFlatten(this,e,t),t},Array.prototype.get=function(e){return e<0||e>=this.length?"":this[e]},Array.prototype.index=function(e,t){const n=this.indexes(e,t);return n.length<=0?null:n[0]},Array.prototype.indexes=function(e,t){let n=[];for(let r=0;r<this.length;r++)null==e?this[r]==t&&n.push(r):void 0!==this[r][e]&&this[r][e]==t&&n.push(r);return n},Array.prototype.insert=function(e,t){return e<0?this.splice(0,0,t):e>=this.length?this.push(t):this.splice(e,0,t),this},Array.prototype.joinIfNotNullOrWhitespace=function(e){let t="";for(let n=0;n<this.length;n++)String.isNullOrWhitespace(this[n])||(String.isNullOrWhitespace(t)||(t+=e),t+=this[n]);return t},Array.prototype.first=function(e,t){for(let n=0;n<this.length;n++)if(void 0!==this[n][e]&&this[n][e]==t)return this[n];return null},Array.prototype.forEachTree=function(e,t){for(let n=0;n<this.length;n++){if(!1===t(this[n]))return;if(!(this[n][e].length<=0)&&!1===this[n][e].forEachTree(e,t))return}},Array.prototype.orderBy=function(e){return this.sort((function(t,n){return t[e]<n[e]?-1:t[e]>n[e]?1:0})),this},Array.prototype.orderByDesc=function(e){return this.sort((function(t,n){return t[e]<n[e]?1:t[e]>n[e]?-1:0})),this},Array.prototype.remove=function(e){let t=[];for(let n=0;n<this.length;n++)this[n]==e&&t.push(n);for(let e=t.length-1;e>=0;e--)this.removeAt(t[e]);return this},Array.prototype.removeAt=function(e){return e<0||e>=this.length||this.splice(e,1),this},Array.prototype.removeRange=function(e){for(let t=0;t<e.length;t++)this.remove(e[t]);return this},Array.prototype.notSelect=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]!=t&&n.push(this[r]);return n},Array.prototype.select=function(e,t){let n=[];for(let r=0;r<this.length;r++)void 0!==this[r][e]&&this[r][e]==t&&n.push(this[r]);return n},Array.prototype.selectMany=function(...e){let t=this;return e.forEach((e=>{t=t.select(e.propName,e.value)})),t},Array.prototype.toList=function(e){let t=[];return this.forEach((n=>{null!=typeof n[e]&&t.push(n[e])})),t},Array.prototype.sortTree=function(e,t){this.orderBy(t);for(let n=0;n<this.length;n++)this[n][e].length<=0||this[n][e].orderBy(t)}},523:()=>{Boolean.isFalse=function(e){return!!String.isNullOrUndefined(e)||e.toString().containsCI("false","f","y","0","x")},Boolean.isTrue=function(e){return!String.isNullOrUndefined(e)&&e.toString().containsCI("true","t","n","1","o")},Boolean.ifTrue=function(e,t,n){return Boolean.isTrue(e)?t:n}},579:()=>{Date.addDays=function(e,t){let n=new Date(e);return n.addDays(t),n},Date.addMonths=function(e,t){let n=new Date(e);return n.addMonths(t),n},Date.addYears=function(e,t){let n=new Date(e);return n.addYears(t),n},Date.max=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(t):new Date(e)},Date.min=function(e,t){return null==e?t:null==t?e:new Date(e)<=new Date(t)?new Date(e):new Date(t)},Date.diffDays=function(e,t){return Math.ceil((new Date(t).getTime()-new Date(e).getTime())/864e5)},Date.today=function(){let e=new Date;return e.setHours(0),e.setMinutes(0),e.setSeconds(0),e.setMilliseconds(0),e},Date.prototype.addDays=function(e){this.setDate(this.getDate()+parseInt(e))},Date.prototype.addMonths=function(e){this.setMonth(this.getMonth()+parseInt(e))},Date.prototype.addYears=function(e){this.setFullYear(this.getFullYear()+parseInt(e))},Date.prototype.toCString=function(e){let t=e;return t=t.replace("fffffff",this.getMilliseconds().toString().padStart(7,"0")),t=t.replace("ffffff",this.getMilliseconds().toString().padStart(6,"0")),t=t.replace("fffff",this.getMilliseconds().toString().padStart(5,"0")),t=t.replace("yyyy",this.getFullYear().toString().padStart(4,"0")),t=t.replace("MMMM","{1}"),t=t.replace("dddd","{2}"),t=t.replace("ffff",this.getMilliseconds().toString().padStart(4,"0")),t=t.replace("yyy",this.getFullYear().toString().padStart(3,"0")),t=t.replace("MMM","{3}"),t=t.replace("ddd","{4}"),t=t.replace("fff",this.getMilliseconds().toString().padStart(3,"0")),t=t.replace("zzz",""),t=t.replace("yy",this.getFullYear().toString().slice(-2)),t=t.replace("MM",(this.getMonth()+1).toString().padStart(2,"0")),t=t.replace("dd",this.getDate().toString().padStart(2,"0")),t=t.replace("HH",this.getHours().toString().padStart(2,"0")),t=t.replace("hh",(this.getHours()>12?this.getHours()-12:this.getHours()).toString().padStart(2,"0")),t=t.replace("mm",this.getMinutes().toString().padStart(2,"0")),t=t.replace("ss",this.getSeconds().toString().padStart(2,"0")),t=t.replace("ff",this.getMilliseconds().toString().padStart(2,"0")),t=t.replace("tt","{5}"),t=t.replace("zz",""),t=t.replace("y",this.getFullYear().toString()),t=t.replace("M",(this.getMonth()+1).toString()),t=t.replace("d",this.getDate().toString()),t=t.replace("H",this.getHours().toString()),t=t.replace("h",(this.getHours()>12?this.getHours()-12:this.getHours()).toString()),t=t.replace("m",this.getMinutes().toString()),t=t.replace("s",this.getSeconds().toString()),t=t.replace("z",""),t=t.replace("t","{6}"),t=t.replace("Z",""),t=t.replace("{1}",this.toLocaleString("default",{month:"long"})),t=t.replace("{2}",this.toLocaleString("default",{weekday:"long"})),t=t.replace("{3}",this.toLocaleString("default",{month:"short"})),t=t.replace("{4}",this.toLocaleString("default",{weekday:"short"})),t=t.replace("{5}",this.getHours()>=12?"PM":"AM"),t=t.replace("{6}",this.getHours()>=12?"P":"A"),t}},874:()=>{Document.ready=async function(e){!async function(){"loading"!==document.readyState?e():document.addEventListener("DOMContentLoaded",(function(){e()}))}()},Document.getWidth=function(e){return null==e||void 0===e?0:e.offsetWidth||e.innerWidth||e.clientWidth},Document.getHeight=function(e){return null==e||void 0===e?0:e.offsetHeight||e.innerHeight||e.clientHeight},Document.appendHtml=function(e,t){const n=document.createElement(t);e.appendChild(n)},Document.addClass=function(e,t){e.classList.contains(t)||e.classList.add(t)},Document.removeClass=function(e,t){e.classList.contains(t)&&e.classList.remove(t)}},705:()=>{Math.randomN=function(e,t){return e=Math.ceil(e),t=Math.floor(t),Math.floor(Math.random()*(t-e)+e)},Math.average=function(e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.avg=function(...e){let t=0;return e.forEach((e=>{t+=parseFloat(e)})),t/e.length},Math.half=function(e){return e/2}},428:()=>{Object.isNullOrUndefined=function(e){return void 0===e||null==e},Object.getDataType=function(e){return String.isNullOrUndefined(e)?"null":"object"==typeof e?Array.isArray(e)?"array":"object":typeof e}},930:()=>{String.isNullOrUndefined=function(e){return void 0===e||null==e},String.isNullOrWhitespace=function(e){return!!String.isNullOrUndefined(e)||("string"==typeof e?e.trim().length<=0:e.toString().trim().length<=0)},String.joinIfNotNullOrWhitespace=function(e,...t){let n="";for(let r=0;r<t.length;r++)String.isNullOrWhitespace(t[r])||(String.isNullOrWhitespace(n)||(n+=e),n+=t[r]);return n},String.prototype.contains=function(...e){for(let t of e)if(this==t)return!0;return!1},String.prototype.containsCI=function(...e){for(let t of e)if(this.toLowerCase()==t.toLowerCase())return!0;return!1},String.prototype.encodeHtmlLinks=function(){return value.replace(/(http[s]{0,1}:\/\/[^\s]+)/g,"<a href='$1'>$1</a>")},String.prototype.toTitleCase=function(){let e=this;return e=e.replace(/([A-Z]{1})/g," $1"),e=e.trim(),e=e.charAt(0).toUpperCase()+e.substr(1),e},String.prototype.getFilename=function(){return this.substring(this.lastIndexOf("/")+1)}},323:()=>{Window.goToTop=function(){Window.scrollTo(0,0)},Window.fragment={get:function(){if(!window.location.hash)return null;const e=window.location.hash.indexOf("?");return e<0?window.location.hash.substring(1):window.location.hash.substring(1,e)},getQuery:function(){if(!window.location.hash)return null;let e=window.location.hash;const t=e.indexOf("?");if(t<0)return null;e=hasQueryString.substring(t+1);const n=new URLSearchParams(e),r={};for(const[e,t]of n.entries())r[e]=t;return r},clear:function(){location.hash="",history.replaceState("","",location.pathname)}}}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r](i,i.exports,n),i.exports}n.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return n.d(t,{a:t}),t},n.d=(e,t)=>{for(var r in t)n.o(t,r)&&!n.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},n.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})};var r={};return(()=>{"use strict";n.r(r),n(814),n(523),n(579),n(874),n(705),n(428),n(930),n(323)})(),r})(),e.exports=t()}},t={};function n(r){var o=t[r];if(void 0!==o)return o.exports;var i=t[r]={exports:{}};return e[r].call(i.exports,i,i.exports,n),i.exports}return(()=>{"use strict";n(645);const e=class{_popupService=null;_containerId=null;constructor(e){this._popupService=e}get Container(){return document.getElementById(this._containerId)}GenerateCheckBox(e,t,n){const r="checkbox"+Math.randomN(100001,999999);let o="";return o+='<div class="form-check form-switch">',o+='<input class="form-check-input" type="checkbox" role="switch" id="'+r+'" name="checkbox'+e+'" '+(n?"checked":"")+">",o+='<label class="form-check-label" for="'+r+'">'+t+"</label>",o+="</div>",o}GenerateCSVLine(e,...t){1===t.length&&"array"==Object.getDataType(t[0])&&(t=t[0]);let n="";for(let r=0;r<t.length;r++)r>0&&(n+=e),n+=t[r];return n}GenerateRow(...e){const t=this;1===e.length&&"array"==Object.getDataType(e[0])&&(e=e[0]);let n="";for(let r=0;r<e.length;r++)n+=t._generateTableCell(e[r]);return"<tr>"+n+"</tr>"}_generateCheckBoxPanel(e,t){const n=this;let r="",o="";for(let t=0;t<e.length;t++)r+=n.GenerateCheckBox(e[t].id,e[t].text,e[t].checked);for(let e=0;e<t.length;e++)o+=n.GenerateCheckBox(t[e].id,t[e].text,t[e].checked);return n.#e(r,o)}_generateTextarea(){let e="";return e+='<textarea class="form-control font-monospace text-sm px-1 py-1" rows="16"></textarea>','<textarea class="form-control font-monospace text-sm px-1 py-1" rows="16"></textarea>'}_generateTable(){let e="";return e+='<table class="table table-bordered table-hover table-sm table-striped">',e+="<thead></thead>",e+="<tbody></tbody>",e+="</table>",'<table class="table table-bordered table-hover table-sm table-striped"><thead></thead><tbody></tbody></table>'}_generateTableCell(e){return'<td class=""><input type="text" class="display" readonly="readonly" value="'+e+'" /></td>'}_generateTableHeader(e,t){const n=this;let r="";for(let t=0;t<e.length;t++)r+="<th>"+e[t]+"</th>";for(let e=0;e<t.length;e++)n._getCheckBox(t[e].id)&&(r+="<th>"+t[e].name+"</th>");return r}_getButton(e){return this.#t("button",e)}_getCheckBox(e){const t="checkbox"+e,n=this.#t("input[type='checkbox'][name='"+t+"']",1);return null!=n&&n.checked}_getComboBox(e){const t=this.#t("select",e);return null==t?"":t.value}_getLabel(e){return this.#t("[role='label']",e)}_getPanel(e,t){return this.#t("div[role='"+e+"']",t)}_getTextBox(e){return this.#t("input[type='text']",e)}_setHtml(e,t){null!=e&&(e.innerHTML=t)}#e(...e){let t="";for(let n=0;n<e.length;n++)t+='<div class="col">'+e[n]+"</div>";return t}#t(e,t){if(null==this.Container)return null;const n=this.Container.querySelectorAll(e);return n.length<=0||n.length>t?null:n[t-1]}},t=class extends e{_button1=null;_button2=null;_label1=null;_panel1=null;_panel2=null;_panel3=null;_textBox1=null;_optionsCol1=[];_optionsCol2=[];_filtersCol1=[];_filtersCol2=[];constructor(e){super(e)}InitialiseComponents(){const e=this,t=e.Container.querySelectorAll("button");e._button1=t[0],e._button2=t[1],e._label1=e._getLabel(1),e._panel1=e._getPanel("options",1),e._panel2=e._getPanel("filters",1),e._panel3=e._getPanel("results",1),e._textBox1=e._getTextBox(1),e.Clear(!0);const n=e._generateCheckBoxPanel(e._optionsCol1,e._optionsCol2);e._setHtml(e._panel1,n);const r=e._generateCheckBoxPanel(e._filtersCol1,e._filtersCol2);e._setHtml(e._panel2,r),e._button1.addEventListener("click",(async function(t){e._button2.disabled=!0,e._textBox1.value="",await e.Search(),e._button2.disabled=!1})),e._button2.addEventListener("click",(async function(t){e._button2.disabled=!0,await e.Search(),e._button2.disabled=!1}))}Clear(e){const t=this;t._label1.innerText="",Boolean.isTrue(e)&&(t._setHtml(t._panel1,""),t._setHtml(t._panel2,"")),t._setHtml(t._panel3,"")}async Search(){const e=this,t=await e._retrieveResult(),n=t.length,r=await e._filterResult(t.copy());switch(r.length==n?e._label1.innerText="Showing "+n+" result"+(1==n?"":"s"):e._label1.innerText="Showing "+r.length+" of "+n+" result"+(1==n?"":"s"),e._getComboBox(2)){case"table":e._renderTable(r);break;case"csv":e._renderCSV(r);break;case"links":e._renderLinks(r)}}async _retrieveResult(){return[]}async _filterResult(e){return e}_renderTable(e){}_renderCSV(e){}_renderLinks(e){}},r=new class{async SendMessage(e,t){chrome.tabs.query({active:!0,currentWindow:!0},(function(n){chrome.tabs.sendMessage(n[0].id,{event:e},t)}))}async GetHyperlinks(){const e=this;return new Promise((function(t){e.SendMessage("GetHyperlinkNodes",(async function(e){t(e.copy())}))}))}async GetImages(){const e=this;return new Promise((function(t){e.SendMessage("GetImageNodes",(async function(e){t(e.copy())}))}))}async GetScripts(){const e=this;return new Promise((function(t){e.SendMessage("GetScriptNodes",(async function(e){t(e.copy())}))}))}async GetLocation(){const e=this;return new Promise((function(t){e.SendMessage("GetLocation",(function(e){t(e)}))}))}async GetMetas(){const e=this;return new Promise((function(t){e.SendMessage("GetMetaNodes",(async function(e){t(e.copy())}))}))}},o=new class extends t{constructor(e){super(e);const t=this;t._containerId="nav-hyperlinks",t._optionsCol1=[{id:1,text:"Show Anchor as HTML",checked:!1},{id:4,text:"Resolve Relative URL",checked:!1}],t._optionsCol2=[{id:3,text:"Sort By Anchor Text",checked:!0},{id:2,text:"Trim Anchor Text",checked:!0}],t._filtersCol1=[{id:12,text:"Hide External Links",checked:!0},{id:5,text:"Hide Duplicates",checked:!0},{id:14,text:"Hide Blank Anchors",checked:!0},{id:15,text:"Hide Blank Links",checked:!0},{id:11,text:"Hide Fragments",checked:!0},{id:13,text:"Hide Mailto/Tel",checked:!0},{id:16,text:"Hide Javascript",checked:!0}],t._filtersCol2=[{id:6,text:"Show Title",checked:!0},{id:7,text:"Show Target",checked:!1},{id:8,text:"Show Rel",checked:!1},{id:9,text:"Show Type",checked:!1},{id:10,text:"Show Count",checked:!1}]}async _retrieveResult(){return await this._popupService.GetHyperlinks()}async _filterResult(e){const t=this,n=await t._popupService.GetLocation(),r=new URL(n).hostname;let o=[];for(let i=0;i<e.length;i++){const l=e[i];if(t._getCheckBox(11)&&l.href.startsWith("#"))continue;if(t._getCheckBox(15)&&String.isNullOrWhitespace(l.href))continue;if(t._getCheckBox(13)&&(l.href.toLowerCase().startsWith("telno:")||l.href.toLowerCase().startsWith("mailto:")))continue;if(t._getCheckBox(16)&&l.href.toLowerCase().startsWith("javascript:"))continue;const s=new URL(l.href,n);if(t._getCheckBox(12)&&r!=s.hostname)continue;let a=t._getCheckBox(1)?l.innerHTML:l.innerText;if(t._getCheckBox(14)&&String.isNullOrWhitespace(a))continue;const c=t._getCheckBox(4)?s.href:l.href;if(t._getCheckBox(2)&&(a=a.trim()),!String.isNullOrWhitespace(t._textBox1.value))if("href"==t._getComboBox(1)){if(!c.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue}else if(!a.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue;o.push({text:a,href:c,title:t._getCheckBox(6)?l.title:"",target:t._getCheckBox(7)?l.target:"",rel:t._getCheckBox(8)?l.rel:"",type:t._getCheckBox(9)?l.type:"",occurrence:""})}if(t._getCheckBox(10)){let e=[];for(let t=0;t<o.length;t++){const n=o.filter((e=>JSON.stringify(e)===JSON.stringify(o[t]))).length;e.push(n)}for(let t=0;t<o.length;t++)o[t].occurrence=e[t]}return t._getCheckBox(5)&&(o=o.distinct()),t._getCheckBox(3)&&(o=o.orderBy("text")),o}_renderTable(e){const t=this,n=t._generateTable();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("thead")[0],o=t._panel3.querySelectorAll("tbody")[0];r.innerHTML="<tr>"+t.#n()+"</tr>";for(let n=0;n<e.length;n++){const r=e[n];let i=[r.text,r.href];t._getCheckBox(6)&&i.push(r.title),t._getCheckBox(7)&&i.push(r.target),t._getCheckBox(8)&&i.push(r.rel),t._getCheckBox(9)&&i.push(r.type),t._getCheckBox(10)&&i.push(r.occurrence),o.innerHTML+=t.GenerateRow(i)}}_renderCSV(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];let i=[o.text,o.href];t._getCheckBox(6)&&i.push(o.title),t._getCheckBox(7)&&i.push(o.target),t._getCheckBox(8)&&i.push(o.rel),t._getCheckBox(9)&&i.push(o.type),t._getCheckBox(10)&&i.push(o.occurrence),r.value+=t.GenerateCSVLine("\t",i),r.value+="\n"}}_renderLinks(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];r.value+=t.GenerateCSVLine("\t",[o.href]),r.value+="\n"}}#n(){return this._generateTableHeader(["Anchor Text","Address"],[{id:6,name:"Title"},{id:7,name:"Target"},{id:8,name:"Rel"},{id:9,name:"Type"},{id:10,name:"Count"}])}}(r),i=new class extends t{constructor(e){super(e);const t=this;t._containerId="nav-images",t._optionsCol1=[{id:203,text:"Sort By Source URL",checked:!0},{id:204,text:"Resolve Relative URL",checked:!1}],t._optionsCol2=[{id:202,text:"Trim Alternate Text",checked:!0}],t._filtersCol1=[{id:212,text:"Hide External Links",checked:!1},{id:205,text:"Hide Duplicates",checked:!0},{id:214,text:"Hide Blank Alternate Text",checked:!1},{id:215,text:"Hide Blank Source URL",checked:!0}],t._filtersCol2=[{id:206,text:"Show Alternative Text",checked:!0},{id:207,text:"Show Source Set",checked:!1},{id:208,text:"Show Image Map",checked:!1},{id:210,text:"Show Count",checked:!1}]}async _retrieveResult(){return await this._popupService.GetImages()}async _filterResult(e){const t=this,n=await t._popupService.GetLocation(),r=new URL(n).hostname;let o=[];for(let i=0;i<e.length;i++){const l=e[i];if(t._getCheckBox(215)&&String.isNullOrWhitespace(l.src))continue;const s=new URL(l.src,n);if(t._getCheckBox(212)&&r!=s.hostname)continue;if(t._getCheckBox(214)&&String.isNullOrWhitespace(l.alt))continue;const a=t._getCheckBox(204)?s.href:l.src,c=t._getCheckBox(202)?l.alt.trim():l.alt;if(!String.isNullOrWhitespace(t._textBox1.value))if("src"==t._getComboBox(1)){if(!a.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue}else if(!c.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue;o.push({src:a,alt:t._getCheckBox(206)?c:"",srcset:t._getCheckBox(207)?l.srcset:"",usemap:t._getCheckBox(208)?l.usemap:"",occurrence:""})}if(t._getCheckBox(210)){let e=[];for(let t=0;t<o.length;t++){const n=o.filter((e=>JSON.stringify(e)===JSON.stringify(o[t]))).length;e.push(n)}for(let t=0;t<o.length;t++)o[t].occurrence=e[t]}return t._getCheckBox(205)&&(o=o.distinct()),t._getCheckBox(203)&&(o=o.orderBy("src")),o}_renderTable(e){const t=this,n=t._generateTable();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("thead")[0],o=t._panel3.querySelectorAll("tbody")[0];r.innerHTML="<tr>"+t.#n()+"</tr>";for(let n=0;n<e.length;n++){const r=e[n];let i=[r.src];t._getCheckBox(206)&&i.push(r.alt),t._getCheckBox(207)&&i.push(r.srcset),t._getCheckBox(208)&&i.push(r.usemap),t._getCheckBox(210)&&i.push(r.occurrence),o.innerHTML+=t.GenerateRow(i)}}_renderCSV(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];let i=[o.src];t._getCheckBox(206)&&i.push(o.alt),t._getCheckBox(207)&&i.push(o.srcset),t._getCheckBox(208)&&i.push(o.usemap),t._getCheckBox(210)&&i.push(o.occurrence),r.value+=t.GenerateCSVLine("\t",i),r.value+="\n"}}_renderLinks(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];r.value+=t.GenerateCSVLine("\t",[o.src]),r.value+="\n"}}#n(){return this._generateTableHeader(["Source"],[{id:206,name:"Alternative Text"},{id:207,name:"Source Set"},{id:208,name:"Image Map"},{id:210,name:"Count"}])}}(r),l=new class extends t{constructor(e){super(e);const t=this;t._containerId="nav-scripts",t._optionsCol1=[{id:303,text:"Sort By Source URL",checked:!0},{id:304,text:"Resolve Relative URL",checked:!1}],t._optionsCol2=[{id:302,text:"Trim Alternate Type",checked:!0}],t._filtersCol1=[{id:312,text:"Hide External Links",checked:!1},{id:305,text:"Hide Duplicates",checked:!0},{id:314,text:"Hide Blank Type",checked:!1},{id:315,text:"Hide Blank Source URL",checked:!0}],t._filtersCol2=[{id:306,text:"Show Type",checked:!0},{id:310,text:"Show Count",checked:!1}]}async _retrieveResult(){return await this._popupService.GetScripts()}async _filterResult(e){const t=this,n=await t._popupService.GetLocation(),r=new URL(n).hostname;let o=[];for(let i=0;i<e.length;i++){const l=e[i];if(t._getCheckBox(315)&&String.isNullOrWhitespace(l.src))continue;const s=new URL(l.src,n);if(t._getCheckBox(312)&&r!=s.hostname)continue;if(t._getCheckBox(314)&&String.isNullOrWhitespace(l.type))continue;const a=t._getCheckBox(304)?s.href:l.src,c=t._getCheckBox(302)?l.type.trim():l.type;if(!String.isNullOrWhitespace(t._textBox1.value))if("src"==t._getComboBox(1)){if(!a.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue}else if(!c.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue;o.push({src:a,type:t._getCheckBox(306)?c:"",occurrence:""})}if(t._getCheckBox(310)){let e=[];for(let t=0;t<o.length;t++){const n=o.filter((e=>JSON.stringify(e)===JSON.stringify(o[t]))).length;e.push(n)}for(let t=0;t<o.length;t++)o[t].occurrence=e[t]}return t._getCheckBox(305)&&(o=o.distinct()),t._getCheckBox(303)&&(o=o.orderBy("src")),o}_renderTable(e){const t=this,n=t._generateTable();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("thead")[0],o=t._panel3.querySelectorAll("tbody")[0];r.innerHTML="<tr>"+t.#n()+"</tr>";for(let n=0;n<e.length;n++){const r=e[n];let i=[r.src];t._getCheckBox(306)&&i.push(r.type),t._getCheckBox(310)&&i.push(r.occurrence),o.innerHTML+=t.GenerateRow(i)}}_renderCSV(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];let i=[o.src];t._getCheckBox(306)&&i.push(o.type),t._getCheckBox(310)&&i.push(o.occurrence),r.value+=t.GenerateCSVLine("\t",i),r.value+="\n"}}_renderLinks(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];r.value+=t.GenerateCSVLine("\t",[o.src]),r.value+="\n"}}#n(){return this._generateTableHeader(["Source"],[{id:306,name:"Type"},{id:310,name:"Count"}])}}(r),s=new class extends t{constructor(e){super(e);const t=this;t._containerId="nav-metas",t._optionsCol1=[{id:303,text:"Sort By Name",checked:!0}],t._optionsCol2=[{id:302,text:"Trim Content",checked:!0}],t._filtersCol1=[{id:305,text:"Hide Duplicates",checked:!0},{id:314,text:"Hide Blank Name",checked:!1},{id:315,text:"Hide Blank Content",checked:!0}],t._filtersCol2=[{id:310,text:"Show Count",checked:!1}]}async _retrieveResult(){return await this._popupService.GetMetas()}async _filterResult(e){const t=this;await t._popupService.GetLocation();let n=[];for(let r=0;r<e.length;r++){const o=e[r],i=t._getCheckBox(302)?o.content.trim():o.content;if(!(t._getCheckBox(315)&&String.isNullOrWhitespace(i)||t._getCheckBox(314)&&String.isNullOrWhitespace(o.name))){if(!String.isNullOrWhitespace(t._textBox1.value))if("name"==t._getComboBox(1)){if(!o.name.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue}else if(!i.toLowerCase().includes(t._textBox1.value.toLowerCase()))continue;n.push({name:o.name,content:i,occurrence:""})}}if(t._getCheckBox(310)){let e=[];for(let t=0;t<n.length;t++){const r=n.filter((e=>JSON.stringify(e)===JSON.stringify(n[t]))).length;e.push(r)}for(let t=0;t<n.length;t++)n[t].occurrence=e[t]}return t._getCheckBox(305)&&(n=n.distinct()),t._getCheckBox(303)&&(n=n.orderBy("name")),n}_renderTable(e){const t=this,n=t._generateTable();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("thead")[0],o=t._panel3.querySelectorAll("tbody")[0];r.innerHTML="<tr>"+t.#n()+"</tr>";for(let n=0;n<e.length;n++){const r=e[n];let i=[r.name,r.content];t._getCheckBox(310)&&i.push(r.occurrence),o.innerHTML+=t.GenerateRow(i)}}_renderCSV(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];let i=[o.name,o.content];t._getCheckBox(310)&&i.push(o.occurrence),r.value+=t.GenerateCSVLine("\t",i),r.value+="\n"}}_renderLinks(e){const t=this,n=t._generateTextarea();t._setHtml(t._panel3,n);const r=t._panel3.querySelectorAll("textarea")[0];for(let n=0;n<e.length;n++){const o=e[n];r.value+=t.GenerateCSVLine("\t",[o.content]),r.value+="\n"}}#n(){return this._generateTableHeader(["Name","Content"],[{id:310,name:"Count"}])}}(r);document.addEventListener("DOMContentLoaded",(function(e){o.InitialiseComponents(),i.InitialiseComponents(),l.InitialiseComponents(),s.InitialiseComponents()}))})(),{}})()));
\ No newline at end of file
diff --git a/popup.html b/popup.html
index d291f0b..f8858a1 100644
--- a/popup.html
+++ b/popup.html
@@ -21,12 +21,32 @@
           <button class="nav-link active" id="nav-home-tab" data-bs-toggle="tab" data-bs-target="#nav-home" type="button" role="tab" aria-controls="nav-home" aria-selected="true">Home</button>
           <button class="nav-link" id="nav-hyperlinks-tab" data-bs-toggle="tab" data-bs-target="#nav-hyperlinks" type="button" role="tab" aria-controls="nav-hyperlinks" aria-selected="false">Hyperlinks</button>
           <button class="nav-link" id="nav-images-tab" data-bs-toggle="tab" data-bs-target="#nav-images" type="button" role="tab" aria-controls="nav-images" aria-selected="false">Images</button>
-          <button class="nav-link" id="nav-disabled-tab" data-bs-toggle="tab" data-bs-target="#nav-disabled" type="button" role="tab" aria-controls="nav-disabled" aria-selected="false" disabled>Disabled</button>
+          <button class="nav-link" id="nav-scripts-tab" data-bs-toggle="tab" data-bs-target="#nav-scripts" type="button" role="tab" aria-controls="nav-scripts" aria-selected="false">Scripts</button>
+          <button class="nav-link" id="nav-metas-tab" data-bs-toggle="tab" data-bs-target="#nav-metas" type="button" role="tab" aria-controls="nav-metas" aria-selected="false">Metas</button>
         </div>
       </nav>
       <div class="tab-content" id="nav-tabContent">
-        <div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab" tabindex="0">...</div>
-        <div class="tab-pane py-3 fade" id="nav-hyperlinks" role="tabpanel" aria-labelledby="nav-hyperlinks-tab" tabindex="0">
+        <div class="tab-pane fade show active" id="nav-home" role="tabpanel" aria-labelledby="nav-home-tab" tabindex="0">
+
+            <div class="container-fluid py-4">
+                <div class="row mb-2">
+                    <div class="col-sm-12">
+                        <img src="./icon128.png" class="mx-auto d-block" alt="Logo" />
+                    </div>
+                </div>
+                <div class="row">
+                    <div class="col-sm-12 text-center">
+                        <h3>Peji Inspektor</h3>
+                        <p>
+                            Peji Inspektor is a browser extension for finding nodes on a web page.
+                            These nodes (or tags) can be filtered and searched to find hyperlinks, images and other assets.
+                        </p>
+                    </div>
+                </div>
+            </div>
+
+        </div>
+        <div class="tab-pane py-3 fade" id="nav-hyperlinks" role="tabpanel" aria-labelledby="nav-hyperlinks-tab" tabindex="1">
 
             <div class="container-fluid">
                 <div class="pt-2 pb-2 mb-2 border-bottom">
@@ -34,11 +54,11 @@
                         <label for="textBox1" class="col-sm-2 col-form-label fw-bold">Search</label>
                         <div class="col-sm-10">
                             <div class="input-group input-group-sm">
-                                <input type="text" class="form-control" role="textbox" id="textBox1" />
+                                <input type="text" class="form-control" id="textBox1" />
 
-                                <select class="form-select pe-0 input-group-text" name="comboBox1">
-                                    <option value="anchor">Anchor</option>
-                                    <option value="link" selected>Link</option>
+                                <select class="form-select pe-0 input-group-text">
+                                    <option value="text">Anchor</option>
+                                    <option value="href" selected>Link</option>
                                 </select>
 
                                 <button type="button" class="btn btn-secondary input-group-text">&#10005;</button>
@@ -50,7 +70,7 @@
                         <div class="col-5">
                             <div class="input-group input-group-sm">
                                 <button class="btn btn-primary" type="button">Load Results</button>
-                                <select class="form-select" name="comboBox2">
+                                <select class="form-select">
                                   <option value="table" selected>Table</option>
                                   <option value="csv">CSV</option>
                                   <option value="links">Links</option>
@@ -82,22 +102,13 @@
                 <div class="row pb-2 mb-2 border-bottom"></div>
 
                 <div class="row pt-2 mb-2">
-                    <div class="col px-0">
-
-                        <table class="table table-bordered table-hover table-sm table-striped">
-                            <thead></thead>
-                            <tbody></tbody>
-                        </table>
-
-                        <textarea class="form-control font-monospace text-sm px-1 py-1" rows="16"></textarea>
-
-                    </div>
+                    <div class="col px-0" role="results"></div>
                 </div>
 
             </div>
 
         </div>
-        <div class="tab-pane fade" id="nav-images" role="tabpanel" aria-labelledby="nav-images-tab" tabindex="0">
+        <div class="tab-pane py-3 fade" id="nav-images" role="tabpanel" aria-labelledby="nav-images-tab" tabindex="2">
 
             <div class="container-fluid">
                 <div class="pt-2 pb-2 mb-2 border-bottom">
@@ -105,9 +116,9 @@
                         <label for="textBox2" class="col-sm-2 col-form-label fw-bold">Search</label>
                         <div class="col-sm-10">
                             <div class="input-group input-group-sm">
-                                <input type="text" class="form-control" role="textbox" id="textBox2" />
+                                <input type="text" class="form-control" id="textBox2" />
 
-                                <select class="form-select pe-0 input-group-text" name="comboBox1">
+                                <select class="form-select pe-0 input-group-text">
                                     <option value="alt">Alternative Text</option>
                                     <option value="src" selected>Source</option>
                                 </select>
@@ -121,7 +132,7 @@
                         <div class="col-5">
                             <div class="input-group input-group-sm">
                                 <button class="btn btn-primary" type="button">Load Results</button>
-                                <select class="form-select" name="comboBox2">
+                                <select class="form-select">
                                   <option value="table" selected>Table</option>
                                   <option value="csv">CSV</option>
                                   <option value="links">Links</option>
@@ -153,22 +164,137 @@
                 <div class="row pb-2 mb-2 border-bottom"></div>
 
                 <div class="row pt-2 mb-2">
-                    <div class="col px-0">
-
-                        <table class="table table-bordered table-hover table-sm table-striped">
-                            <thead></thead>
-                            <tbody></tbody>
-                        </table>
-
-                        <textarea class="form-control font-monospace text-sm px-1 py-1" rows="16"></textarea>
-
-                    </div>
+                    <div class="col px-0"role="results"></div>
                 </div>
 
             </div>
 
         </div>
-        <div class="tab-pane fade" id="nav-disabled" role="tabpanel" aria-labelledby="nav-disabled-tab" tabindex="0">...</div>
+        <div class="tab-pane py-3 fade" id="nav-scripts" role="tabpanel" aria-labelledby="nav-scripts-tab" tabindex="3">
+
+            <div class="container-fluid">
+                <div class="pt-2 pb-2 mb-2 border-bottom">
+                    <div class="row mb-2">
+                        <label for="textBox3" class="col-sm-2 col-form-label fw-bold">Search</label>
+                        <div class="col-sm-10">
+                            <div class="input-group input-group-sm">
+                                <input type="text" class="form-control" id="textBox3" />
+
+                                <select class="form-select pe-0 input-group-text">
+                                    <option value="type">Type</option>
+                                    <option value="src" selected>Source</option>
+                                </select>
+
+                                <button type="button" class="btn btn-secondary input-group-text">&#10005;</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mt-2 mb-2">
+                        <div class="col-2"></div>
+                        <div class="col-5">
+                            <div class="input-group input-group-sm">
+                                <button class="btn btn-primary" type="button">Load Results</button>
+                                <select class="form-select">
+                                  <option value="table" selected>Table</option>
+                                  <option value="csv">CSV</option>
+                                  <option value="links">Links</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-5 px-0">
+                            <div class="pt-2" role="label"></div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="fw-bold clearfix cursor-pointer" data-bs-toggle="collapse" data-bs-target="#collapsPanel5" aria-expanded="false" aria-controls="collapsPanel5">&#11208;&nbsp;Options</div>
+                <div class="row pb-2 mb-2 border-bottom collapse" id="collapsPanel5">
+                    <div class="col-sm-2"></div>
+                    <div class="col-sm-10">
+                        <div class="row px-0" role="options"></div>
+                    </div>
+                </div>
+
+                <div class="fw-bold clearfix cursor-pointer" data-bs-toggle="collapse" data-bs-target="#collapsPanel6" aria-expanded="false" aria-controls="collapsPanel6">&#11208;&nbsp;Filters</div>
+                <div class="row collapse" id="collapsPanel6">
+                    <div class="col-sm-2"></div>
+                    <div class="col-sm-10">
+                        <div class="row px-0" role="filters"></div>
+                    </div>
+                </div>
+
+                <div class="row pb-2 mb-2 border-bottom"></div>
+
+                <div class="row pt-2 mb-2">
+                    <div class="col px-0"role="results"></div>
+                </div>
+
+            </div>
+
+        </div>
+        <div class="tab-pane py-3 fade" id="nav-metas" role="tabpanel" aria-labelledby="nav-metas-tab" tabindex="3">
+
+            <div class="container-fluid">
+                <div class="pt-2 pb-2 mb-2 border-bottom">
+                    <div class="row mb-2">
+                        <label for="textBox3" class="col-sm-2 col-form-label fw-bold">Search</label>
+                        <div class="col-sm-10">
+                            <div class="input-group input-group-sm">
+                                <input type="text" class="form-control" id="textBox3" />
+
+                                <select class="form-select pe-0 input-group-text">
+                                    <option value="content">Content</option>
+                                    <option value="name" selected>Name</option>
+                                </select>
+
+                                <button type="button" class="btn btn-secondary input-group-text">&#10005;</button>
+                            </div>
+                        </div>
+                    </div>
+                    <div class="row mt-2 mb-2">
+                        <div class="col-2"></div>
+                        <div class="col-5">
+                            <div class="input-group input-group-sm">
+                                <button type="button" class="btn btn-primary">Load Results</button>
+                                <select class="form-select">
+                                  <option value="table" selected>Table</option>
+                                  <option value="csv">CSV</option>
+                                  <option value="links">Links</option>
+                                </select>
+                            </div>
+                        </div>
+                        <div class="col-5 px-0">
+                            <div class="pt-2" role="label"></div>
+                        </div>
+                    </div>
+                </div>
+
+                <div class="fw-bold clearfix cursor-pointer" data-bs-toggle="collapse" data-bs-target="#collapsPanel7" aria-expanded="false" aria-controls="collapsPanel7">&#11208;&nbsp;Options</div>
+                <div class="row pb-2 mb-2 border-bottom collapse" id="collapsPanel7">
+                    <div class="col-sm-2"></div>
+                    <div class="col-sm-10">
+                        <div class="row px-0" role="options"></div>
+                    </div>
+                </div>
+
+                <div class="fw-bold clearfix cursor-pointer" data-bs-toggle="collapse" data-bs-target="#collapsPanel8" aria-expanded="false" aria-controls="collapsPanel8">&#11208;&nbsp;Filters</div>
+                <div class="row collapse" id="collapsPanel8">
+                    <div class="col-sm-2"></div>
+                    <div class="col-sm-10">
+                        <div class="row px-0" role="filters"></div>
+                    </div>
+                </div>
+
+                <div class="row pb-2 mb-2 border-bottom"></div>
+
+                <div class="row pt-2 mb-2">
+                    <div class="col px-0"role="results"></div>
+                </div>
+
+            </div>
+
+        </div>
+
       </div>
 
 
diff --git a/src/src/popup.js b/src/src/popup.js
index a041e71..4e55c78 100644
--- a/src/src/popup.js
+++ b/src/src/popup.js
@@ -1,17 +1,23 @@
 // src/popup.js
 import PopupService from './popup/popup-service.js';
-import AContentService from './popup/acontent-service.js';
-import ImgContentService from './popup/imgcontent-service.js';
+import AContentService from './popup/a-content-service.js';
+import ImgContentService from './popup/img-content-service.js';
+import ScriptContentService from './popup/script-content-service.js';
+import MetaContentService from './popup/meta-content-service.js';
 
 
 const popupService = new PopupService();
 const aContentService = new AContentService(popupService);
 const imgContentService = new ImgContentService(popupService);
+const scriptContentService = new ScriptContentService(popupService);
+const metaContentService = new MetaContentService(popupService);
 
 
-document.addEventListener("DOMContentLoaded", async function(event) {
+document.addEventListener("DOMContentLoaded", function(event) {
 
     aContentService.InitialiseComponents();
     imgContentService.InitialiseComponents();
+    scriptContentService.InitialiseComponents();
+    metaContentService.InitialiseComponents();
 
 });
\ No newline at end of file
diff --git a/src/src/popup/a-content-service.js b/src/src/popup/a-content-service.js
new file mode 100644
index 0000000..4abd174
--- /dev/null
+++ b/src/src/popup/a-content-service.js
@@ -0,0 +1,280 @@
+import '../../../literyz-js/extensions.dist.js';
+
+import TabContentService from './tab-content-service.js';
+
+
+class AContentService extends TabContentService {
+
+    constructor(popupService) {
+        super(popupService);
+
+        const a = this;
+
+        a._containerId = "nav-hyperlinks";
+        a._optionsCol1 = [
+            { id: 1, text: "Show Anchor as HTML", checked: false },
+            { id: 4, text: "Resolve Relative URL", checked: false }
+        ];
+        a._optionsCol2 = [
+            { id: 3, text: "Sort By Anchor Text", checked: true },
+            { id: 2, text: "Trim Anchor Text", checked: true }
+        ];
+        a._filtersCol1 = [
+            { id: 12, text: "Hide External Links", checked: true },
+            { id: 5, text: "Hide Duplicates", checked: true },
+            { id: 14, text: "Hide Blank Anchors", checked: true },
+            { id: 15, text: "Hide Blank Links", checked: true },
+            { id: 11, text: "Hide Fragments", checked: true },
+            { id: 13, text: "Hide Mailto/Tel", checked: true },
+            { id: 16, text: "Hide Javascript", checked: true }
+        ];
+        a._filtersCol2 = [
+            { id: 6, text: "Show Title", checked: true },
+            { id: 7, text: "Show Target", checked: false },
+            { id: 8, text: "Show Rel", checked: false },
+            { id: 9, text: "Show Type", checked: false },
+            { id: 10, text: "Show Count", checked: false }
+        ];
+
+    }
+
+    async _retrieveResult() {
+        return await this._popupService.GetHyperlinks();
+    }
+
+    async _filterResult(items) {
+        const a = this;
+        const currentUrl = await a._popupService.GetLocation();
+        const currentHostname = (new URL(currentUrl)).hostname;
+
+        let result = [];
+
+        for (let i=0; i<items.length; i++) {
+            const item = items[i];
+
+            // Hide fragments
+            if (a._getCheckBox(11)) {
+                if (item.href.startsWith("#")) {
+                    continue;
+                }
+            }
+
+            // Hide Blank Links
+            if (a._getCheckBox(15)) {
+                if (String.isNullOrWhitespace(item.href)) {
+                    continue;
+                }
+            }
+
+            // Hide mailto/tel
+            if (a._getCheckBox(13)) {
+                if (item.href.toLowerCase().startsWith("telno:") || item.href.toLowerCase().startsWith("mailto:")) {
+                    continue;
+                }
+            }
+
+            // Hide javascript
+            if (a._getCheckBox(16)) {
+                if (item.href.toLowerCase().startsWith("javascript:")) {
+                    continue;
+                }
+            }
+
+            const absoluteUrl = new URL(item.href, currentUrl);
+
+            // Hide external links
+            if (a._getCheckBox(12)) {
+                if (currentHostname != absoluteUrl.hostname) {
+                    continue;
+                }
+            }
+
+            // Show anchor as html
+            let text = (a._getCheckBox(1) ? item.innerHTML : item.innerText);
+
+            // Hide Blank Anchors
+            if (a._getCheckBox(14)) {
+                if (String.isNullOrWhitespace(text)) {
+                    continue;
+                }
+            }
+
+            // Resolve relative url
+            const href = (a._getCheckBox(4) ? absoluteUrl.href : item.href);
+
+            // Trim anchor text
+            if (a._getCheckBox(2)) {
+                text = text.trim();
+            }
+
+            // Search term
+            if (!String.isNullOrWhitespace(a._textBox1.value)) {
+                if (a._getComboBox(1) == "href") {
+                    if (!href.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                } else {
+                    if (!text.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                }
+            }
+
+            result.push({
+                text: text,
+                href: href,
+                title: (a._getCheckBox(6) ? item.title : ""),
+                target: (a._getCheckBox(7) ? item.target : ""),
+                rel: (a._getCheckBox(8) ? item.rel : ""),
+                type: (a._getCheckBox(9) ? item.type : ""),
+                occurrence: ""
+              });
+        }
+
+        // Show occurrence
+        if (a._getCheckBox(10)) {
+            // Calc occurrences, store in cache
+            let occurrenceCache = [];
+            for (let i=0; i<result.length; i++) {
+                const occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
+
+                occurrenceCache.push(occurrence);
+            }
+
+            // Update result with occurrence
+            for (let i=0; i<result.length; i++) {
+                result[i].occurrence = occurrenceCache[i];
+            }
+        }
+
+        // Hide duplicates
+        if (a._getCheckBox(5)) {
+            result = result.distinct();
+        }
+
+        // Sort by anchor text
+        if (a._getCheckBox(3)) {
+            result = result.orderBy("text");
+        }
+
+        return result;
+    }
+
+    _renderTable(results) {
+        const a = this;
+        const table = a._generateTable();
+
+        a._setHtml(a._panel3, table);
+
+        const thead = a._panel3.querySelectorAll("thead")[0];
+        const tbody = a._panel3.querySelectorAll("tbody")[0];
+
+        // Write thead
+        thead.innerHTML = "<tr>" + a.#generateTableHeader() + "</tr>";
+
+        // Write tbody
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.text, item.href ];
+
+            if (a._getCheckBox(6)) {
+                row.push(item.title);
+            }
+
+            if (a._getCheckBox(7)) {
+                row.push(item.target);
+            }
+
+            if (a._getCheckBox(8)) {
+                row.push(item.rel);
+            }
+
+            if (a._getCheckBox(9)) {
+                row.push(item.type);
+            }
+
+            if (a._getCheckBox(10)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.innerHTML += a.GenerateRow(row);
+        }
+    }
+
+    _renderCSV(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.text, item.href ];
+
+            if (a._getCheckBox(6)) {
+                row.push(item.title);
+            }
+
+            if (a._getCheckBox(7)) {
+                row.push(item.target);
+            }
+
+            if (a._getCheckBox(8)) {
+                row.push(item.rel);
+            }
+
+            if (a._getCheckBox(9)) {
+                row.push(item.type);
+            }
+
+            if (a._getCheckBox(10)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.value += a.GenerateCSVLine("\t", row);
+            tbody.value += "\n";
+        }
+    }
+
+    _renderLinks(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            tbody.value += a.GenerateCSVLine("\t", [ item.href ]);
+            tbody.value += "\n";
+        }
+    }
+
+    #generateTableHeader() {
+        const a = this;
+
+        const columns1 = [
+            "Anchor Text",
+            "Address"
+        ];
+        const columns2 = [
+            { id: 6, name: "Title" },
+            { id: 7, name:  "Target" },
+            { id: 8, name:  "Rel" },
+            { id: 9, name:  "Type" },
+            { id: 10, name:  "Count" }
+        ];
+
+        return a._generateTableHeader(columns1, columns2);
+    }
+
+}
+
+
+export default AContentService;
\ No newline at end of file
diff --git a/src/src/popup/acontent-service.js b/src/src/popup/acontent-service.js
deleted file mode 100644
index 5269fb8..0000000
--- a/src/src/popup/acontent-service.js
+++ /dev/null
@@ -1,502 +0,0 @@
-import '../../../literyz-js/extensions.dist.js';
-
-import ContentService from './content-service.js';
-
-
-class AContentService extends ContentService {
-    #containerPanel = null;
-    #popupService = null;
-
-
-    constructor(popupService) {
-        super();
-
-        this.#popupService = popupService;
-    }
-
-    InitialiseComponents() {
-        const a = this;
-
-        a.Clear();
-
-        a.#initialiseComponents_Options();
-        a.#initialiseComponents_Filters();
-
-        a.Button1.addEventListener('click', async function (e) {
-            a.Button2.disabled = true;
-
-            a.TextBox1.value = "";
-
-            await a.Search();
-
-            a.Button2.disabled = false;
-        });
-
-        a.Button2.addEventListener('click', async function (e) {
-            a.Button2.disabled = true;
-
-            await a.Search();
-
-            a.Button2.disabled = false;
-        });
-    }
-
-    #initialiseComponents_Options() {
-        const a = this;
-
-        let col1 = "";
-        col1 += a.GenerateCheckBox(1, "Show Anchor as HTML", false);
-        col1 += a.GenerateCheckBox(4, "Resolve Relative URL", false);
-
-        let col2 = "";
-        col2 += a.GenerateCheckBox(3, "Sort By Anchor Text", true);
-        col2 += a.GenerateCheckBox(2, "Trim Anchor Text", true);
-
-        let html = a.GenerateCols(col1, col2);
-
-        a.SetHtml(a.Panel1, html);
-    }
-
-    #initialiseComponents_Filters() {
-        const a = this;
-
-        let col1 = "";
-        col1 += a.GenerateCheckBox(12, "Hide External Links", true);
-        col1 += a.GenerateCheckBox(5, "Hide Duplicates", true);
-        col1 += a.GenerateCheckBox(14, "Hide Blank Anchors", true);
-        col1 += a.GenerateCheckBox(15, "Hide Blank Links", true);
-        col1 += a.GenerateCheckBox(11, "Hide Fragments", true);
-        col1 += a.GenerateCheckBox(13, "Hide Mailto/Tel", true);
-        col1 += a.GenerateCheckBox(16, "Hide Javascript", true);
-
-        let col2 = "";
-        col2 += a.GenerateCheckBox(6, "Show Title", true);
-        col2 += a.GenerateCheckBox(7, "Show Target", false);
-        col2 += a.GenerateCheckBox(8, "Show Rel", false);
-        col2 += a.GenerateCheckBox(9, "Show Type", false);
-        col2 += a.GenerateCheckBox(10, "Show Count", false);
-
-        let html = a.GenerateCols(col1, col2);
-
-        a.SetHtml(a.Panel2, html);
-    }
-
-
-    get Button1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("button")[0];
-    }
-
-    get Button2() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("button")[1];
-    }
-
-    get Container() {
-        const a = this;
-
-        if (a.#containerPanel == null) {
-            a.#containerPanel = document.getElementById("nav-hyperlinks");
-        }
-
-        return a.#containerPanel;
-    }
-
-    get Label1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("[role='label']")[0];
-    }
-
-    get MemoBox1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("textarea")[0];
-    }
-
-    get Panel1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("div[role='options']")[0];
-    }
-
-    get Panel2() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("div[role='filters']")[0];
-    }
-
-    get Table1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("table")[0];
-    }
-
-    get TextBox1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("input[role='textbox']")[0];
-    }
-
-
-    Clear() {
-        const a = this;
-
-        a.Table1.style.display = 'none';
-        a.MemoBox1.style.display = 'none';
-
-        a.SetHtml(a.Panel1, "");
-        a.SetHtml(a.Panel2, "");
-    }
-
-    async Search() {
-        const a = this;
-
-        a.Label1.innerText = "";
-
-        a.Table1.style.display = 'none';
-        a.MemoBox1.style.display = 'none';
-
-        const result = await a.#popupService.GetHyperlinks();
-        const totalCount = result.length;
-
-        const newResults = await a.#filterResult(result.copy());
-
-        if (newResults.length == totalCount) {
-            a.Label1.innerText = "Showing " + totalCount + " result" + (totalCount == 1 ? "" : "s");
-        } else {
-            a.Label1.innerText = "Showing " + newResults.length + " of " + totalCount + " result" + (totalCount == 1 ? "" : "s");
-        }
-
-        switch (a.#getComboBox(2)) {
-            case "table":
-                a.#renderTable(newResults);
-                break;
-            case "csv":
-                a.#renderCSV(newResults);
-                break;
-            case "links":
-                a.#renderLinks(newResults);
-                break;
-            default:
-                break;
-        }
-    }
-
-    async #filterResult(items) {
-        const a = this;
-        const currentUrl = await a.#popupService.GetLocation();
-        const currentHostname = (new URL(currentUrl)).hostname;
-
-        let result = [];
-
-        for (let i=0; i<items.length; i++) {
-            const item = items[i];
-
-            // Hide fragments
-            if (a.#getCheckBox(11)) {
-                if (item.href.startsWith("#")) {
-                    continue;
-                }
-            }
-
-            // Hide blank links
-            if (a.#getCheckBox(15)) {
-                if (String.isNullOrWhitespace(item.href)) {
-                    continue;
-                }
-            }
-
-            // Hide mailto/tel
-            if (a.#getCheckBox(13)) {
-                if (item.href.toLowerCase().startsWith("telno:") || item.href.toLowerCase().startsWith("mailto:")) {
-                    continue;
-                }
-            }
-
-            // Hide javascript
-            if (a.#getCheckBox(16)) {
-                if (item.href.toLowerCase().startsWith("javascript:")) {
-                    continue;
-                }
-            }
-
-            const absoluteUrl = new URL(item.href, currentUrl);
-
-            // Hide external links
-            if (a.#getCheckBox(12)) {
-                if (currentHostname != absoluteUrl.hostname) {
-                    continue;
-                }
-            }
-
-            // Show anchor as html
-            let text = (a.#getCheckBox(1) ? item.innerHTML : item.innerText);
-
-            // Hide blank anchors
-            if (a.#getCheckBox(14)) {
-                if (String.isNullOrWhitespace(text)) {
-                    continue;
-                }
-            }
-
-            // Resolve relative url
-            const href = (a.#getCheckBox(4) ? absoluteUrl.href : item.href);
-
-            // Trim anchor text
-            if (a.#getCheckBox(2)) {
-                text = text.trim();
-            }
-
-            // Search term
-            if (!String.isNullOrWhitespace(a.TextBox1.value)) {
-                if (a.#getComboBox(1) == "anchor") {
-                    if (!text.toLowerCase().includes(a.TextBox1.value.toLowerCase())) {
-                        continue;
-                    }
-                } else {
-                    if (!href.toLowerCase().includes(a.TextBox1.value.toLowerCase())) {
-                        continue;
-                    }
-                }
-            }
-
-            result.push({
-                text: text,
-                href: href,
-                title: (a.#getCheckBox(6) ? item.title : ""),
-                target: (a.#getCheckBox(7) ? item.target : ""),
-                rel: (a.#getCheckBox(8) ? item.rel : ""),
-                type: (a.#getCheckBox(9) ? item.type : ""),
-                occurrence: ""
-              });
-        }
-
-        // Show occurrence
-        if (a.#getCheckBox(10)) {
-            // Calc occurrences, store in cache
-            let occurrenceCache = [];
-            for (let i=0; i<result.length; i++) {
-                const occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
-
-                occurrenceCache.push(occurrence);
-            }
-
-            // Update result with occurrence
-            for (let i=0; i<result.length; i++) {
-                result[i].occurrence = occurrenceCache[i];
-            }
-        }
-
-        // Hide duplicates
-        if (a.#getCheckBox(5)) {
-            result = result.distinct();
-        }
-
-        // Sort by anchor text
-        if (a.#getCheckBox(3)) {
-            result = result.orderBy("text");
-        }
-
-        return result;
-    }
-
-    #generateTHeader() {
-        const a = this;
-        const columns = [
-            { id: 6, name: "Title" },
-            { id: 7, name:  "Target" },
-            { id: 8, name:  "Rel" },
-            { id: 9, name:  "Type" },
-            { id: 10, name:  "Count" }
-        ];
-
-        let html = "";
-        html += "<th>Anchor Text</th>";
-        html += "<th>Address</th>";
-
-        for (let i=0; i<columns.length; i++) {
-            if (a.#getCheckBox(columns[i].id)) {
-                html += "<th>" + columns[i].name + "</th>";
-            }
-        }
-
-        return html;
-    }
-
-    #getCheckBox(num) {
-        const a = this;
-
-        if (a.Container == null) {
-            return false;
-        }
-
-        const result = a.Container.querySelectorAll("input[name='checkbox" + num + "']");
-        if (result.length <= 0) {
-            return false;
-        }
-
-        return result[0].checked;
-    }
-
-    #getComboBox(num) {
-        const a = this;
-
-        if (a.Container == null) {
-            return "";
-        }
-
-        const result = a.Container.querySelectorAll("select[name='comboBox" + num + "']");
-        if (result.length <= 0) {
-            return "";
-        }
-
-        return result[0].value;
-    }
-
-    #getRadioGroup(num) {
-        const a = this;
-
-        if (a.Container == null) {
-            return "";
-        }
-
-        const result = a.Container.querySelectorAll("input[name='radioGroup" + num + "']:checked");
-        if (result.length <= 0) {
-            return "";
-        }
-
-        return result[0].value;
-    }
-
-    #renderTable(results) {
-        const a = this;
-        const thead = a.Table1.querySelectorAll("thead")[0];
-        const tbody = a.Table1.querySelectorAll("tbody")[0];
-
-        thead.innerHTML = "";
-        tbody.innerHTML = "";
-
-        a.Table1.style.display = 'table';
-
-        // Write thead
-        thead.innerHTML = "<tr>" + a.#generateTHeader() + "</tr>";
-
-        // Write tbody
-        for (let i=0; i<results.length; i++) {
-            const item = results[i];
-
-            let row = [ item.text, item.href ];
-
-            if (a.#getCheckBox(6)) {
-                row.push(item.title);
-            }
-
-            if (a.#getCheckBox(7)) {
-                row.push(item.target);
-            }
-
-            if (a.#getCheckBox(8)) {
-                row.push(item.rel);
-            }
-
-            if (a.#getCheckBox(9)) {
-                row.push(item.type);
-            }
-
-            if (a.#getCheckBox(10)) {
-                row.push(item.occurrence);
-            }
-
-            tbody.innerHTML += a.GenerateRow(row);
-        }
-    }
-
-    #renderCSV(results) {
-        const a = this;
-
-        a.MemoBox1.value = "";
-        a.MemoBox1.style.display = 'inline-block';
-
-        for (let i=0; i<results.length; i++) {
-            const item = results[i];
-
-            let row = [ item.text, item.href ];
-
-            if (a.#getCheckBox(6)) {
-                row.push(item.title);
-            }
-
-            if (a.#getCheckBox(7)) {
-                row.push(item.target);
-            }
-
-            if (a.#getCheckBox(8)) {
-                row.push(item.rel);
-            }
-
-            if (a.#getCheckBox(9)) {
-                row.push(item.type);
-            }
-
-            if (a.#getCheckBox(10)) {
-                row.push(item.occurrence);
-            }
-
-            a.MemoBox1.value += a.GenerateCSVLine("\t", row);
-            a.MemoBox1.value += "\n";
-        }
-    }
-
-    #renderLinks(results) {
-        const a = this;
-
-        a.MemoBox1.value = "";
-        a.MemoBox1.style.display = 'inline-block';
-
-        for (let i=0; i<results.length; i++) {
-            const item = results[i];
-
-            a.MemoBox1.value += a.GenerateCSVLine("\t", [ item.href ]);
-            a.MemoBox1.value += "\n";
-        }
-    }
-
-}
-
-
-export default AContentService;
\ No newline at end of file
diff --git a/src/src/popup/content-service.js b/src/src/popup/content-service.js
index bf893a2..3ec4b6d 100644
--- a/src/src/popup/content-service.js
+++ b/src/src/popup/content-service.js
@@ -1,23 +1,68 @@
 // import '../references/extensions.dist.js';
 
 class ContentService {
+    _popupService = null;
 
-    GenerateCheckBox(num, label, checked) {
-        let html = "";
-        html += "<div class=\"form-check form-switch\">";
-        html += "<input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" id=\"checkbox" + num + "\" name=\"checkbox" + num + "\" " + (checked ? "checked" : "") + ">";
-        html += "<label class=\"form-check-label\" for=\"checkbox" + num + "\">" + label + "</label>";
-        html += "</div>";
+    _containerId = null;
 
-        return html;
+
+    constructor(popupService) {
+        const a  = this;
+
+        a._popupService = popupService;
     }
 
-    GenerateCols(...args) {
-        let html = "";
 
-        for (let i=0; i<args.length; i++) {
-            html += "<div class=\"col\">" + args[i] + "</div>";
-        }
+    get Container() {
+        const a = this;
+
+        return document.getElementById(a._containerId);
+    }
+
+    // get Panel1() {
+    //     return this.#getElement("div[role='options']", 1);
+    // }
+
+    // get Panel2() {
+    //     return this.#getElement("div[role='filters']", 1);
+    // }
+
+    // get Panel3() {
+    //     return this.#getElement("div[role='results']", 1);
+    // }
+
+
+    // Clear(clearAll) {
+    //     const a = this;
+    //     const label1 = a._getLabel(1);
+
+    //     label1.innerText = "";
+
+    //     if (Boolean.isTrue(clearAll)) {
+    //         a._setHtml(a.Panel1, "");
+    //         a._setHtml(a.Panel2, "");
+    //     }
+
+    //     a._setHtml(a.Panel3, "");
+    // }
+
+    // async Search() {
+    //     const a = this;
+
+    //     a.Clear(false);
+    // }
+
+
+    GenerateCheckBox(num, label, checked) {
+        const randId = Math.randomN(100001, 999999);
+        const id = "checkbox" + randId;
+        const name = "checkbox" + num;
+
+        let html = "";
+        html += "<div class=\"form-check form-switch\">";
+        html += "<input class=\"form-check-input\" type=\"checkbox\" role=\"switch\" id=\"" + id + "\" name=\"" + name + "\" " + (checked ? "checked" : "") + ">";
+        html += "<label class=\"form-check-label\" for=\"" + id + "\">" + label + "</label>";
+        html += "</div>";
 
         return html;
     }
@@ -43,15 +88,17 @@ class ContentService {
         return result;
     }
 
-    GenerateRadioBox(groupNo, num, label, value, checked) {
-        let html = "";
-        html += "<div class=\"form-check\">";
-        html += "<input class=\"form-check-input\" type=\"radio\" name=\"radioGroup" + groupNo + "\" id=\"radioBox" + num + "\" value=\"" + value + "\" " + (checked ? "checked" : "") + ">";
-        html += "<label class=\"form-check-label\" for=\"radioBox" + num + "\">" + label + "</label>";
-        html += "</div>";
+    // GenerateRadioBox(groupNo, num, label, value, checked) {
+    //     const randId = Math.randomN(100001, 999999);
 
-        return html;
-    }
+    //     let html = "";
+    //     html += "<div class=\"form-check\">";
+    //     html += "<input class=\"form-check-input\" type=\"radio\" name=\"radioGroup" + groupNo + "\" id=\"radioBox" + randId + "\" value=\"" + value + "\" " + (checked ? "checked" : "") + ">";
+    //     html += "<label class=\"form-check-label\" for=\"radioBox" + randId + "\">" + label + "</label>";
+    //     html += "</div>";
+
+    //     return html;
+    // }
 
     GenerateRow(...args) {
         const a = this;
@@ -64,17 +111,113 @@ class ContentService {
 
         let result = "";
         for (let i=0; i<args.length; i++) {
-            result = result + a.GenerateRowCell(args[i]);
+            result = result + a._generateTableCell(args[i]);
         }
 
         return "<tr>" + result + "</tr>";
     }
 
-    GenerateRowCell(value) {
+
+
+    _generateCheckBoxPanel(col1, col2) {
+        const a = this;
+
+        let colContent1 = "";
+        let colContent2 = "";
+
+        for (let i=0; i<col1.length; i++) {
+            colContent1 += a.GenerateCheckBox(col1[i].id, col1[i].text, col1[i].checked);
+        }
+
+        for (let i=0; i<col2.length; i++) {
+            colContent2 += a.GenerateCheckBox(col2[i].id, col2[i].text, col2[i].checked);
+        }
+
+        return a.#generateCols(colContent1, colContent2);
+    }
+
+    _generateTextarea() {
+        let html = "";
+        html += "<textarea class=\"form-control font-monospace text-sm px-1 py-1\" rows=\"16\"></textarea>";
+
+        return html;
+    }
+
+    _generateTable() {
+        let html = "";
+        html += "<table class=\"table table-bordered table-hover table-sm table-striped\">";
+        html += "<thead></thead>";
+        html += "<tbody></tbody>";
+        html += "</table>";
+
+        return html;
+    }
+
+    _generateTableCell(value) {
         return "<td class=\"\"><input type=\"text\" class=\"display\" readonly=\"readonly\" value=\"" + value + "\" /></td>";
     }
 
-    SetHtml(element, htmlContent) {
+    _generateTableHeader(fixedColumns, conditionalColumns) {
+        const a = this;
+
+        let html = "";
+        for (let i=0; i<fixedColumns.length; i++) {
+            html += "<th>" + fixedColumns[i] + "</th>";
+        }
+
+        for (let i=0; i<conditionalColumns.length; i++) {
+            if (!a._getCheckBox(conditionalColumns[i].id)) {
+                continue;
+            }
+
+            html += "<th>" + conditionalColumns[i].name + "</th>";
+        }
+
+        return html;
+    }
+
+
+    _getButton(num) {
+        return this.#getElement("button", num);
+    }
+
+    _getCheckBox(id) {
+        const a = this;
+        const name = "checkbox" + id;
+
+        const el = this.#getElement("input[type='checkbox'][name='" + name + "']", 1);
+        if (el == null) {
+            return false;
+        }
+
+        return el.checked;
+    }
+
+    _getComboBox(num) {
+        const a = this;
+
+        const el = a.#getElement("select", num);
+        if (el == null) {
+            return "";
+        }
+
+        return el.value;
+    }
+
+    _getLabel(num) {
+        return this.#getElement("[role='label']", num);
+    }
+
+    _getPanel(name, num) {
+        return this.#getElement("div[role='" + name + "']", num);
+    }
+
+    _getTextBox(num) {
+        return this.#getElement("input[type='text']", num);
+    }
+
+
+    _setHtml(element, htmlContent) {
         if (element == null) {
             return;
         }
@@ -82,6 +225,36 @@ class ContentService {
         element.innerHTML = htmlContent;
     }
 
+
+    #generateCols(...args) {
+        let html = "";
+
+        for (let i=0; i<args.length; i++) {
+            html += "<div class=\"col\">" + args[i] + "</div>";
+        }
+
+        return html;
+    }
+
+    #getElement(nodeName, num) {
+        const a = this;
+
+        if (a.Container == null) {
+            return null;
+        }
+
+        const nodes = a.Container.querySelectorAll(nodeName);
+        if (nodes.length <= 0) {
+            return null;
+        }
+
+        if (nodes.length > num) {
+            return null;
+        }
+
+        return nodes[(num - 1)];
+    }
+
 }
 
 
diff --git a/src/src/popup/img-content-service.js b/src/src/popup/img-content-service.js
new file mode 100644
index 0000000..3bb7e7e
--- /dev/null
+++ b/src/src/popup/img-content-service.js
@@ -0,0 +1,233 @@
+import TabContentService from './tab-content-service.js';
+
+
+class ImgContentService extends TabContentService {
+
+    constructor(popupService) {
+        super(popupService);
+
+        const a = this;
+
+        a._containerId = "nav-images";
+        a._optionsCol1 = [
+            { id: 203, text: "Sort By Source URL", checked: true },
+            { id: 204, text: "Resolve Relative URL", checked: false }
+        ];
+        a._optionsCol2 = [
+            { id: 202, text: "Trim Alternate Text", checked: true }
+        ];
+        a._filtersCol1 = [
+            { id: 212, text: "Hide External Links", checked: false },
+            { id: 205, text: "Hide Duplicates", checked: true },
+            { id: 214, text: "Hide Blank Alternate Text", checked: false },
+            { id: 215, text: "Hide Blank Source URL", checked: true }
+        ];
+        a._filtersCol2 = [
+            { id: 206, text: "Show Alternative Text", checked: true },
+            { id: 207, text: "Show Source Set", checked: false },
+            { id: 208, text: "Show Image Map", checked: false },
+            { id: 210, text: "Show Count", checked: false }
+        ];
+
+    }
+
+    async _retrieveResult() {
+        return await this._popupService.GetImages();
+    }
+
+    async _filterResult(items) {
+        const a = this;
+        const currentUrl = await a._popupService.GetLocation();
+        const currentHostname = (new URL(currentUrl)).hostname;
+
+        let result = [];
+
+        for (let i=0; i<items.length; i++) {
+            const item = items[i];
+
+            // Hide source
+            if (a._getCheckBox(215)) {
+                if (String.isNullOrWhitespace(item.src)) {
+                    continue;
+                }
+            }
+
+            const absoluteUrl = new URL(item.src, currentUrl);
+
+            // Hide external links
+            if (a._getCheckBox(212)) {
+                if (currentHostname != absoluteUrl.hostname) {
+                    continue;
+                }
+            }
+
+            // Hide blank alternative text
+            if (a._getCheckBox(214)) {
+                if (String.isNullOrWhitespace(item.alt)) {
+                    continue;
+                }
+            }
+
+            // Resolve source
+            const src = (a._getCheckBox(204) ? absoluteUrl.href : item.src);
+            const alt = (a._getCheckBox(202) ? item.alt.trim() : item.alt);
+
+            // Search term
+            if (!String.isNullOrWhitespace(a._textBox1.value)) {
+                if (a._getComboBox(1) == "src") {
+                    if (!src.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                } else {
+                    if (!alt.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                }
+            }
+
+            result.push({
+                src: src,
+                alt: (a._getCheckBox(206) ? alt : ""),
+                srcset: (a._getCheckBox(207) ? item.srcset : ""),
+                usemap: (a._getCheckBox(208) ? item.usemap : ""),
+                occurrence: ""
+              });
+        }
+
+        // Show occurrence
+        if (a._getCheckBox(210)) {
+            // Calc occurrences, store in cache
+            let occurrenceCache = [];
+            for (let i=0; i<result.length; i++) {
+                const occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
+
+                occurrenceCache.push(occurrence);
+            }
+
+            // Update result with occurrence
+            for (let i=0; i<result.length; i++) {
+                result[i].occurrence = occurrenceCache[i];
+            }
+        }
+
+        // Hide duplicates
+        if (a._getCheckBox(205)) {
+            result = result.distinct();
+        }
+
+        // Sort by source
+        if (a._getCheckBox(203)) {
+            result = result.orderBy("src");
+        }
+
+        return result;
+    }
+
+    _renderTable(results) {
+        const a = this;
+        const table = a._generateTable();
+
+        a._setHtml(a._panel3, table);
+
+        const thead = a._panel3.querySelectorAll("thead")[0];
+        const tbody = a._panel3.querySelectorAll("tbody")[0];
+
+        // Write thead
+        thead.innerHTML = "<tr>" + a.#generateTableHeader() + "</tr>";
+
+        // Write tbody
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.src ];
+
+            if (a._getCheckBox(206)) {
+                row.push(item.alt);
+            }
+
+            if (a._getCheckBox(207)) {
+                row.push(item.srcset);
+            }
+
+            if (a._getCheckBox(208)) {
+                row.push(item.usemap);
+            }
+
+            if (a._getCheckBox(210)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.innerHTML += a.GenerateRow(row);
+        }
+    }
+
+    _renderCSV(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.src ];
+
+            if (a._getCheckBox(206)) {
+                row.push(item.alt);
+            }
+
+            if (a._getCheckBox(207)) {
+                row.push(item.srcset);
+            }
+
+            if (a._getCheckBox(208)) {
+                row.push(item.usemap);
+            }
+
+            if (a._getCheckBox(210)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.value += a.GenerateCSVLine("\t", row);
+            tbody.value += "\n";
+        }
+    }
+
+    _renderLinks(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            tbody.value += a.GenerateCSVLine("\t", [ item.src ]);
+            tbody.value += "\n";
+        }
+    }
+
+    #generateTableHeader() {
+        const a = this;
+
+        const columns1 = [
+            "Source"
+        ];
+        const columns2 = [
+            { id: 206, name: "Alternative Text" },
+            { id: 207, name:  "Source Set" },
+            { id: 208, name:  "Image Map" },
+            { id: 210, name:  "Count" }
+        ];
+
+        return a._generateTableHeader(columns1, columns2);
+    }
+
+}
+
+
+export default ImgContentService;
\ No newline at end of file
diff --git a/src/src/popup/imgcontent-service.js b/src/src/popup/imgcontent-service.js
deleted file mode 100644
index f27bd3f..0000000
--- a/src/src/popup/imgcontent-service.js
+++ /dev/null
@@ -1,444 +0,0 @@
-import '../../../literyz-js/extensions.dist.js';
-
-import ContentService from './content-service.js';
-
-
-class ImgContentService extends ContentService {
-    #containerPanel = null;
-    #popupService = null;
-
-
-    constructor(popupService) {
-        super();
-
-        this.#popupService = popupService;
-    }
-
-    InitialiseComponents() {
-        const a = this;
-
-        a.Clear();
-
-        a.#initialiseComponents_Options();
-        a.#initialiseComponents_Filters();
-
-        a.Button1.addEventListener('click', async function (e) {
-            a.Button2.disabled = true;
-
-            a.TextBox1.value = "";
-
-            await a.Search();
-
-            a.Button2.disabled = false;
-        });
-
-        a.Button2.addEventListener('click', async function (e) {
-            a.Button2.disabled = true;
-
-            await a.Search();
-
-            a.Button2.disabled = false;
-        });
-    }
-
-    #initialiseComponents_Options() {
-        const a = this;
-
-        let col1 = "";
-        col1 += a.GenerateCheckBox(203, "Sort By Source URL", true);
-        col1 += a.GenerateCheckBox(204, "Resolve Relative URL", false);
-
-        let col2 = "";
-        col2 += a.GenerateCheckBox(202, "Trim Alternate Text", true);
-
-        let html = a.GenerateCols(col1, col2);
-
-        a.SetHtml(a.Panel1, html);
-    }
-
-    #initialiseComponents_Filters() {
-        const a = this;
-
-        let col1 = "";
-        col1 += a.GenerateCheckBox(212, "Hide External Links", false);
-        col1 += a.GenerateCheckBox(205, "Hide Duplicates", true);
-        col1 += a.GenerateCheckBox(214, "Hide Blank Alternate Text", false);
-        col1 += a.GenerateCheckBox(215, "Hide Blank Source URL", true);
-
-        let col2 = "";
-        col2 += a.GenerateCheckBox(206, "Show Alternative Text", true);
-        col2 += a.GenerateCheckBox(207, "Show Source Set", false);
-        col2 += a.GenerateCheckBox(208, "Show Image Map", false);
-        // col2 += a.GenerateCheckBox(209, "Show Width", false);
-        // col2 += a.GenerateCheckBox(210, "Show Height", false);
-        col2 += a.GenerateCheckBox(210, "Show Count", false);
-
-        let html = a.GenerateCols(col1, col2);
-
-        a.SetHtml(a.Panel2, html);
-    }
-
-
-    get Button1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("button")[0];
-    }
-
-    get Button2() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("button")[1];
-    }
-
-    get Container() {
-        const a = this;
-
-        if (a.#containerPanel == null) {
-            a.#containerPanel = document.getElementById("nav-images");
-        }
-
-        return a.#containerPanel;
-    }
-
-    get Label1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("[role='label']")[0];
-    }
-
-    get MemoBox1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("textarea")[0];
-    }
-
-    get Panel1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("div[role='options']")[0];
-    }
-
-    get Panel2() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("div[role='filters']")[0];
-    }
-
-    get Table1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("table")[0];
-    }
-
-    get TextBox1() {
-        const a = this;
-
-        if (a.Container == null) {
-            return null;
-        }
-
-        return a.Container.querySelectorAll("input[role='textbox']")[0];
-    }
-
-
-    Clear() {
-        const a = this;
-
-        a.Table1.style.display = 'none';
-        a.MemoBox1.style.display = 'none';
-
-        a.SetHtml(a.Panel1, "");
-        a.SetHtml(a.Panel2, "");
-    }
-
-    async Search() {
-        const a = this;
-
-        a.Label1.innerText = "";
-
-        a.Table1.style.display = 'none';
-        a.MemoBox1.style.display = 'none';
-
-        const result = await a.#popupService.GetImages();
-        const totalCount = result.length;
-
-        const newResults = await a.#filterResult(result.copy());
-
-        if (newResults.length == totalCount) {
-            a.Label1.innerText = "Showing " + totalCount + " result" + (totalCount == 1 ? "" : "s");
-        } else {
-            a.Label1.innerText = "Showing " + newResults.length + " of " + totalCount + " result" + (totalCount == 1 ? "" : "s");
-        }
-
-        switch (a.#getComboBox(2)) {
-            case "table":
-                a.#renderTable(newResults);
-                break;
-            case "csv":
-                a.#renderCSV(newResults);
-                break;
-            case "links":
-                a.#renderLinks(newResults);
-                break;
-            default:
-                break;
-        }
-    }
-
-    async #filterResult(items) {
-        const a = this;
-        const currentUrl = await a.#popupService.GetLocation();
-        const currentHostname = (new URL(currentUrl)).hostname;
-
-        let result = [];
-
-        for (let i=0; i<items.length; i++) {
-            const item = items[i];
-
-            // Hide source
-            if (a.#getCheckBox(215)) {
-                if (String.isNullOrWhitespace(item.src)) {
-                    continue;
-                }
-            }
-
-            const absoluteUrl = new URL(item.src, currentUrl);
-
-            // Hide external links
-            if (a.#getCheckBox(212)) {
-                if (currentHostname != absoluteUrl.hostname) {
-                    continue;
-                }
-            }
-
-            // Hide blank alternative text
-            if (a.#getCheckBox(214)) {
-                if (String.isNullOrWhitespace(item.alt)) {
-                    continue;
-                }
-            }
-
-            // Resolve source
-            const src = (a.#getCheckBox(204) ? absoluteUrl.href : item.src);
-            const alt = (a.#getCheckBox(202) ? item.alt.trim() : item.alt);
-
-            // Search term
-            if (!String.isNullOrWhitespace(a.TextBox1.value)) {
-                if (a.#getComboBox(201) == "alt") {
-                    if (!alt.toLowerCase().includes(a.TextBox1.value.toLowerCase())) {
-                        continue;
-                    }
-                } else {
-                    if (!src.toLowerCase().includes(a.TextBox1.value.toLowerCase())) {
-                        continue;
-                    }
-                }
-            }
-
-            result.push({
-                src: src,
-                alt: (a.#getCheckBox(206) ? alt : ""),
-                srcset: (a.#getCheckBox(207) ? item.srcset : ""),
-                usemap: (a.#getCheckBox(208) ? item.usemap : ""),
-                occurrence: ""
-              });
-        }
-
-        // Show occurrence
-        if (a.#getCheckBox(210)) {
-            // Calc occurrences, store in cache
-            let occurrenceCache = [];
-            for (let i=0; i<result.length; i++) {
-                const occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
-
-                occurrenceCache.push(occurrence);
-            }
-
-            // Update result with occurrence
-            for (let i=0; i<result.length; i++) {
-                result[i].occurrence = occurrenceCache[i];
-            }
-        }
-
-        // Hide duplicates
-        if (a.#getCheckBox(205)) {
-            result = result.distinct();
-        }
-
-        // Sort by source
-        if (a.#getCheckBox(203)) {
-            result = result.orderBy("src");
-        }
-
-        return result;
-    }
-
-    #generateTHeader() {
-        const a = this;
-        const columns = [
-            { id: 206, name: "Alternative Text" },
-            { id: 207, name:  "Source Set" },
-            { id: 208, name:  "Image Map" },
-            { id: 210, name:  "Count" }
-        ];
-
-        let html = "";
-        html += "<th>Source</th>";
-
-        for (let i=0; i<columns.length; i++) {
-            if (a.#getCheckBox(columns[i].id)) {
-                html += "<th>" + columns[i].name + "</th>";
-            }
-        }
-
-        return html;
-    }
-
-    #getCheckBox(num) {
-        const a = this;
-
-        if (a.Container == null) {
-            return false;
-        }
-
-        const result = a.Container.querySelectorAll("input[name='checkbox" + num + "']");
-        if (result.length <= 0) {
-            return false;
-        }
-
-        return result[0].checked;
-    }
-
-    #getComboBox(num) {
-        const a = this;
-
-        if (a.Container == null) {
-            return "";
-        }
-
-        const result = a.Container.querySelectorAll("select[name='comboBox" + num + "']");
-        if (result.length <= 0) {
-            return "";
-        }
-
-        return result[0].value;
-    }
-
-    #renderTable(results) {
-        const a = this;
-        const thead = a.Table1.querySelectorAll("thead")[0];
-        const tbody = a.Table1.querySelectorAll("tbody")[0];
-
-        thead.innerHTML = "";
-        tbody.innerHTML = "";
-
-        a.Table1.style.display = 'table';
-
-        // Write thead
-        thead.innerHTML = "<tr>" + a.#generateTHeader() + "</tr>";
-
-        // Write tbody
-        for (let i=0; i<results.length; i++) {
-            const item = results[i];
-
-            let row = [ item.src ];
-
-            if (a.#getCheckBox(206)) {
-                row.push(item.alt);
-            }
-
-            if (a.#getCheckBox(207)) {
-                row.push(item.srcset);
-            }
-
-            if (a.#getCheckBox(208)) {
-                row.push(item.usemap);
-            }
-
-            if (a.#getCheckBox(210)) {
-                row.push(item.occurrence);
-            }
-
-            tbody.innerHTML += a.GenerateRow(row);
-        }
-    }
-
-    #renderCSV(results) {
-        const a = this;
-
-        a.MemoBox1.value = "";
-        a.MemoBox1.style.display = 'inline-block';
-
-        for (let i=0; i<results.length; i++) {
-            const item = results[i];
-
-            let row = [ item.src ];
-
-            if (a.#getCheckBox(206)) {
-                row.push(item.alt);
-            }
-
-            if (a.#getCheckBox(207)) {
-                row.push(item.srcset);
-            }
-
-            if (a.#getCheckBox(208)) {
-                row.push(item.usemap);
-            }
-
-            if (a.#getCheckBox(210)) {
-                row.push(item.occurrence);
-            }
-
-            a.MemoBox1.value += a.GenerateCSVLine("\t", row);
-            a.MemoBox1.value += "\n";
-        }
-    }
-
-    #renderLinks(results) {
-        const a = this;
-
-        a.MemoBox1.value = "";
-        a.MemoBox1.style.display = 'inline-block';
-
-        for (let i=0; i<results.length; i++) {
-            const item = results[i];
-
-            a.MemoBox1.value += a.GenerateCSVLine("\t", [ item.src ]);
-            a.MemoBox1.value += "\n";
-        }
-    }
-
-}
-
-
-export default ImgContentService;
\ No newline at end of file
diff --git a/src/src/popup/meta-content-service.js b/src/src/popup/meta-content-service.js
new file mode 100644
index 0000000..754c0d3
--- /dev/null
+++ b/src/src/popup/meta-content-service.js
@@ -0,0 +1,188 @@
+import TabContentService from './tab-content-service.js';
+
+
+class MetaContentService extends TabContentService {
+
+    constructor(popupService) {
+        super(popupService);
+
+        const a = this;
+
+        a._containerId = "nav-metas";
+        a._optionsCol1 = [
+            { id: 303, text: "Sort By Name", checked: true }
+        ];
+        a._optionsCol2 = [
+            { id: 302, text: "Trim Content", checked: true }
+        ];
+        a._filtersCol1 = [
+            { id: 305, text: "Hide Duplicates", checked: true },
+            { id: 314, text: "Hide Blank Name", checked: false },
+            { id: 315, text: "Hide Blank Content", checked: true }
+        ];
+        a._filtersCol2 = [
+            { id: 310, text: "Show Count", checked: false }
+        ];
+
+    }
+
+    async _retrieveResult() {
+        return await this._popupService.GetMetas();
+    }
+
+    async _filterResult(items) {
+        const a = this;
+        const currentUrl = await a._popupService.GetLocation();
+
+        let result = [];
+
+        for (let i=0; i<items.length; i++) {
+            const item = items[i];
+
+            const content = (a._getCheckBox(302) ? item.content.trim() : item.content);
+
+            // Hide source
+            if (a._getCheckBox(315)) {
+                if (String.isNullOrWhitespace(content)) {
+                    continue;
+                }
+            }
+
+            // Hide blank type
+            if (a._getCheckBox(314)) {
+                if (String.isNullOrWhitespace(item.name)) {
+                    continue;
+                }
+            }
+
+            // Search term
+            if (!String.isNullOrWhitespace(a._textBox1.value)) {
+                if (a._getComboBox(1) == "name") {
+                    if (!item.name.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                } else {
+                    if (!content.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                }
+            }
+
+            result.push({
+                name: item.name,
+                content: content,
+                occurrence: ""
+              });
+        }
+
+        // Show occurrence
+        if (a._getCheckBox(310)) {
+            // Calc occurrences, store in cache
+            let occurrenceCache = [];
+            for (let i=0; i<result.length; i++) {
+                const occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
+
+                occurrenceCache.push(occurrence);
+            }
+
+            // Update result with occurrence
+            for (let i=0; i<result.length; i++) {
+                result[i].occurrence = occurrenceCache[i];
+            }
+        }
+
+        // Hide duplicates
+        if (a._getCheckBox(305)) {
+            result = result.distinct();
+        }
+
+        // Sort by name
+        if (a._getCheckBox(303)) {
+            result = result.orderBy("name");
+        }
+
+        return result;
+    }
+
+    _renderTable(results) {
+        const a = this;
+        const table = a._generateTable();
+
+        a._setHtml(a._panel3, table);
+
+        const thead = a._panel3.querySelectorAll("thead")[0];
+        const tbody = a._panel3.querySelectorAll("tbody")[0];
+
+        // Write thead
+        thead.innerHTML = "<tr>" + a.#generateTableHeader() + "</tr>";
+
+        // Write tbody
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.name, item.content ];
+
+            if (a._getCheckBox(310)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.innerHTML += a.GenerateRow(row);
+        }
+    }
+
+    _renderCSV(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.name, item.content ];
+
+            if (a._getCheckBox(310)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.value += a.GenerateCSVLine("\t", row);
+            tbody.value += "\n";
+        }
+    }
+
+    _renderLinks(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            tbody.value += a.GenerateCSVLine("\t", [ item.content ]);
+            tbody.value += "\n";
+        }
+    }
+
+    #generateTableHeader() {
+        const a = this;
+
+        const columns1 = [
+            "Name",
+            "Content"
+        ];
+        const columns2 = [
+            { id: 310, name:  "Count" }
+        ];
+
+        return a._generateTableHeader(columns1, columns2);
+    }
+
+}
+
+
+export default MetaContentService;
\ No newline at end of file
diff --git a/src/src/popup/popup-service.js b/src/src/popup/popup-service.js
index 3668e9c..ac1eeba 100644
--- a/src/src/popup/popup-service.js
+++ b/src/src/popup/popup-service.js
@@ -17,7 +17,6 @@ class PopupService {
                 resolve(payload.copy());
             });
         });
-
     }
 
     async GetImages() {
@@ -28,7 +27,16 @@ class PopupService {
                 resolve(payload.copy());
             });
         });
+    }
 
+    async GetScripts() {
+        const a = this;
+
+        return new Promise(function(resolve) {
+            a.SendMessage("GetScriptNodes", async function(payload) {
+                resolve(payload.copy());
+            });
+        });
     }
 
     async GetLocation() {
@@ -41,6 +49,16 @@ class PopupService {
         });
     }
 
+    async GetMetas() {
+        const a = this;
+
+        return new Promise(function(resolve) {
+            a.SendMessage("GetMetaNodes", async function(payload) {
+                resolve(payload.copy());
+            });
+        });
+    }
+
 }
 
 
diff --git a/src/src/popup/script-content-service.js b/src/src/popup/script-content-service.js
new file mode 100644
index 0000000..e038d28
--- /dev/null
+++ b/src/src/popup/script-content-service.js
@@ -0,0 +1,211 @@
+import TabContentService from './tab-content-service.js';
+
+
+class ScriptContentService extends TabContentService {
+
+    constructor(popupService) {
+        super(popupService);
+
+        const a = this;
+
+        a._containerId = "nav-scripts";
+        a._optionsCol1 = [
+            { id: 303, text: "Sort By Source URL", checked: true },
+            { id: 304, text: "Resolve Relative URL", checked: false }
+        ];
+        a._optionsCol2 = [
+            { id: 302, text: "Trim Alternate Type", checked: true }
+        ];
+        a._filtersCol1 = [
+            { id: 312, text: "Hide External Links", checked: false },
+            { id: 305, text: "Hide Duplicates", checked: true },
+            { id: 314, text: "Hide Blank Type", checked: false },
+            { id: 315, text: "Hide Blank Source URL", checked: true }
+        ];
+        a._filtersCol2 = [
+            { id: 306, text: "Show Type", checked: true },
+            { id: 310, text: "Show Count", checked: false }
+        ];
+
+    }
+
+    async _retrieveResult() {
+        return await this._popupService.GetScripts();
+    }
+
+    async _filterResult(items) {
+        const a = this;
+        const currentUrl = await a._popupService.GetLocation();
+        const currentHostname = (new URL(currentUrl)).hostname;
+
+        let result = [];
+
+        for (let i=0; i<items.length; i++) {
+            const item = items[i];
+
+            // Hide source
+            if (a._getCheckBox(315)) {
+                if (String.isNullOrWhitespace(item.src)) {
+                    continue;
+                }
+            }
+
+            const absoluteUrl = new URL(item.src, currentUrl);
+
+            // Hide external links
+            if (a._getCheckBox(312)) {
+                if (currentHostname != absoluteUrl.hostname) {
+                    continue;
+                }
+            }
+
+            // Hide blank type
+            if (a._getCheckBox(314)) {
+                if (String.isNullOrWhitespace(item.type)) {
+                    continue;
+                }
+            }
+
+            // Resolve source
+            const src = (a._getCheckBox(304) ? absoluteUrl.href : item.src);
+            const type = (a._getCheckBox(302) ? item.type.trim() : item.type);
+
+            // Search term
+            if (!String.isNullOrWhitespace(a._textBox1.value)) {
+                if (a._getComboBox(1) == "src") {
+                    if (!src.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                } else {
+                    if (!type.toLowerCase().includes(a._textBox1.value.toLowerCase())) {
+                        continue;
+                    }
+                }
+            }
+
+            result.push({
+                src: src,
+                type: (a._getCheckBox(306) ? type : ""),
+                occurrence: ""
+              });
+        }
+
+        // Show occurrence
+        if (a._getCheckBox(310)) {
+            // Calc occurrences, store in cache
+            let occurrenceCache = [];
+            for (let i=0; i<result.length; i++) {
+                const occurrence = result.filter(item => JSON.stringify(item) === JSON.stringify(result[i])).length;
+
+                occurrenceCache.push(occurrence);
+            }
+
+            // Update result with occurrence
+            for (let i=0; i<result.length; i++) {
+                result[i].occurrence = occurrenceCache[i];
+            }
+        }
+
+        // Hide duplicates
+        if (a._getCheckBox(305)) {
+            result = result.distinct();
+        }
+
+        // Sort by source
+        if (a._getCheckBox(303)) {
+            result = result.orderBy("src");
+        }
+
+        return result;
+    }
+
+    _renderTable(results) {
+        const a = this;
+        const table = a._generateTable();
+
+        a._setHtml(a._panel3, table);
+
+        const thead = a._panel3.querySelectorAll("thead")[0];
+        const tbody = a._panel3.querySelectorAll("tbody")[0];
+
+        // Write thead
+        thead.innerHTML = "<tr>" + a.#generateTableHeader() + "</tr>";
+
+        // Write tbody
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.src ];
+
+            if (a._getCheckBox(306)) {
+                row.push(item.type);
+            }
+
+            if (a._getCheckBox(310)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.innerHTML += a.GenerateRow(row);
+        }
+    }
+
+    _renderCSV(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            let row = [ item.src ];
+
+            if (a._getCheckBox(306)) {
+                row.push(item.type);
+            }
+
+            if (a._getCheckBox(310)) {
+                row.push(item.occurrence);
+            }
+
+            tbody.value += a.GenerateCSVLine("\t", row);
+            tbody.value += "\n";
+        }
+    }
+
+    _renderLinks(results) {
+        const a = this;
+        const textarea = a._generateTextarea();
+
+        a._setHtml(a._panel3, textarea);
+
+        const tbody = a._panel3.querySelectorAll("textarea")[0];
+
+        for (let i=0; i<results.length; i++) {
+            const item = results[i];
+
+            tbody.value += a.GenerateCSVLine("\t", [ item.src ]);
+            tbody.value += "\n";
+        }
+    }
+
+    #generateTableHeader() {
+        const a = this;
+
+        const columns1 = [
+            "Source"
+        ];
+        const columns2 = [
+            { id: 306, name: "Type" },
+            { id: 310, name:  "Count" }
+        ];
+
+        return a._generateTableHeader(columns1, columns2);
+    }
+
+}
+
+
+export default ScriptContentService;
\ No newline at end of file
diff --git a/src/src/popup/tab-content-service.js b/src/src/popup/tab-content-service.js
new file mode 100644
index 0000000..5ec85d3
--- /dev/null
+++ b/src/src/popup/tab-content-service.js
@@ -0,0 +1,129 @@
+import ContentService from './content-service.js';
+
+
+class TabContentService extends ContentService {
+    _button1 = null;
+    _button2 = null;
+    _label1 = null;
+    _panel1 = null;
+    _panel2 = null;
+    _panel3 = null;
+    _textBox1 = null;
+
+    _optionsCol1 = [];
+    _optionsCol2 = [];
+    _filtersCol1 = [];
+    _filtersCol2 = [];
+
+
+    constructor(popupService) {
+        super(popupService);
+    }
+
+    InitialiseComponents() {
+        const a = this;
+
+        const buttons = a.Container.querySelectorAll("button");
+        a._button1 = buttons[0];
+        a._button2 = buttons[1];
+        a._label1 = a._getLabel(1);
+        a._panel1 = a._getPanel("options", 1);
+        a._panel2 = a._getPanel("filters", 1);
+        a._panel3 = a._getPanel("results", 1);
+        a._textBox1 = a._getTextBox(1);
+
+        a.Clear(true);
+
+        // Initialise options
+        const htmlContent1 = a._generateCheckBoxPanel(a._optionsCol1, a._optionsCol2);
+
+        a._setHtml(a._panel1, htmlContent1);
+
+        // Initialise filters
+        const htmlContent2 = a._generateCheckBoxPanel(a._filtersCol1, a._filtersCol2);
+
+        a._setHtml(a._panel2, htmlContent2);
+
+        // Events
+        a._button1.addEventListener('click', async function (e) {
+            a._button2.disabled = true;
+
+            a._textBox1.value = "";
+
+            await a.Search();
+
+            a._button2.disabled = false;
+        });
+
+        a._button2.addEventListener('click', async function (e) {
+            a._button2.disabled = true;
+
+            await a.Search();
+
+            a._button2.disabled = false;
+        });
+    }
+
+    Clear(clearAll) {
+        const a = this;
+
+        a._label1.innerText = "";
+
+        if (Boolean.isTrue(clearAll)) {
+            a._setHtml(a._panel1, "");
+            a._setHtml(a._panel2, "");
+        }
+
+        a._setHtml(a._panel3, "");
+    }
+
+    async Search() {
+        const a = this;
+
+        const result = await a._retrieveResult();
+        const totalCount = result.length;
+
+        const newResults = await a._filterResult(result.copy());
+
+        if (newResults.length == totalCount) {
+            a._label1.innerText = "Showing " + totalCount + " result" + (totalCount == 1 ? "" : "s");
+        } else {
+            a._label1.innerText = "Showing " + newResults.length + " of " + totalCount + " result" + (totalCount == 1 ? "" : "s");
+        }
+
+        switch (a._getComboBox(2)) {
+            case "table":
+                a._renderTable(newResults);
+                break;
+            case "csv":
+                a._renderCSV(newResults);
+                break;
+            case "links":
+                a._renderLinks(newResults);
+                break;
+            default:
+                break;
+        }
+    }
+
+    async _retrieveResult() {
+        return [];
+    }
+
+    async _filterResult(result) {
+        return result;
+    }
+
+    _renderTable(result) {
+    }
+
+    _renderCSV(result) {
+    }
+
+    _renderLinks(result) {
+    }
+
+}
+
+
+export default TabContentService;
\ No newline at end of file