diff --git a/api.js b/api.js
index e77d6a3..a4404ec 100644
--- a/api.js
+++ b/api.js
@@ -1,6 +1,8 @@
 /**
  * Wraps up the remote calling API.
  */
+
+// Private variables
 var $_connection = null;
 var $_listeners = {};
 
@@ -28,77 +30,77 @@ function $_addlistener(obj, evt, cb) {
 	$_listeners[en].push(cb);
 }
 
-function $ListApi(obj) {
-	this.$obj = obj;
-	Object.freeze(this);
-}
-
-$ListApi.prototype = {
-	get: function(cb) {
-		var msg = {$name: this.$obj};
-		if (cb) {
-			chrome.extension.sendRequest(msg, cb);
-		} else {
-			chrome.extension.sendRequest(msg);
-		}
-	},
-	each: function(cb) {
-		chrome.extension.sendRequest({$name: this.$obj}, function(items) {
-			for (i in items.sort()) {
-				cb(items[i], i);
+const UseHttps = {
+	site: {
+		all: function(cb) {
+			chrome.extension.sendRequest({$name: 'site.all'}, cb);
+		},
+		each: function(cb) {
+			UseHttps.site.all(function(sites) {
+				sites.forEach(function(site) {
+					cb(site);
+				});
+			});
+		},
+		get: function(site, cb) {
+			chrome.extension.sendRequest({$name: 'site.get', site:site}, cb);
+		},
+		add: function(site, data, cb) {
+			var msg = {$name: 'site.add', site: site, status: data.status};
+			if (cb) {
+				chrome.extension.sendRequest(msg, cb);
+			} else {
+				chrome.extension.sendRequest(msg);
 			}
-		});
-	},
-	add: function(site, cb) {
-		var msg = {$name: this.$obj+'.add', site:site};
-		if (cb) {
-			chrome.extension.sendRequest(msg, cb);
-		} else {
-			chrome.extension.sendRequest(msg);
-		}
-	},
-	del: function(site, cb) {
-		var msg = {$name: this.$obj+'.del', site:site};
-		if (cb) {
-			chrome.extension.sendRequest(msg, cb);
-		} else {
-			chrome.extension.sendRequest(msg);
-		}
-	},
-	match: function(site, cb) {
-		var msg = {$name: this.$obj+'.match', site:site};
-		if (cb) {
-			chrome.extension.sendRequest(msg, cb);
-		} else {
-			chrome.extension.sendRequest(msg);
+		},
+		set: function(site, data, cb) {
+			var msg = {$name: 'site.set', site: site, status: data.status};
+			if (cb) {
+				chrome.extension.sendRequest(msg, cb);
+			} else {
+				chrome.extension.sendRequest(msg);
+			}
+		},
+		makeItSo: function(site, data, cb) {
+			var msg = {$name: 'site.set', site: site, status: data.status};
+			if (cb) {
+				chrome.extension.sendRequest(msg, cb);
+			} else {
+				chrome.extension.sendRequest(msg);
+			}
+		},
+		del: function(site, cb) {
+			var msg = {$name: 'site.del', site: site};
+			if (cb) {
+				chrome.extension.sendRequest(msg, cb);
+			} else {
+				chrome.extension.sendRequest(msg);
+			}
+		},
+		match: function(site, cb) {
+			chrome.extension.sendRequest({$name: 'site.match', site:site}, cb);
+		},
+		connect: function(evt, cb) {
+			$_addlistener('site', evt, cb);
 		}
 	},
-	clear: function() {
-		chrome.extension.sendRequest({$name: this.$obj+'.clear'});
-	},
-	connect: function(evt, cb) {
-		$_addlistener(this.$obj, evt, cb);
-	}
-};
-
-const UseHttps = {
-	sitelist: new $ListApi('sitelist'),
-	potentials: new $ListApi('potentials'),
-	blacklist: new $ListApi('blacklist'),
-	clearAll: function() {
-		chrome.extension.sendRequest({$name: 'clearAll'});
-	},
-	enabled: {
-		get: function(cb) {
-			var msg = {$name: 'enabled'};
+	setting: {
+		get: function(name, cb) {
+			chrome.extension.sendRequest({$name: 'setting.get', name:name}, cb);
+		},
+		has: function(name, cb) {
+			chrome.extension.sendRequest({$name: 'setting.has', name:name}, cb);
+		},
+		set: function(name, value, cb) {
+			var msg = {$name: 'setting.set', name: name, value: value};
 			if (cb) {
 				chrome.extension.sendRequest(msg, cb);
 			} else {
 				chrome.extension.sendRequest(msg);
 			}
 		},
-		set: function(value, cb) {
-			var msg = {$name: 'enabled.set', value: value};
+		del: function(name, cb) {
+			var msg = {$name: 'setting.del', name:name};
 			if (cb) {
 				chrome.extension.sendRequest(msg, cb);
 			} else {
@@ -106,7 +108,7 @@ const UseHttps = {
 			}
 		},
 		connect: function(evt, cb) {
-			$_addlistener('enabled', evt, cb);
+			$_addlistener('setting', evt, cb);
 		}
 	},
 	haspotential: function(site, cb) {
diff --git a/background.html b/background.html
index e594e80..baf985b 100644
--- a/background.html
+++ b/background.html
@@ -1,119 +1,126 @@
 <script src="jsonstore.js"></script>
 <script src="sitepile.js"></script>
 <script>
-//FIXME: Expire these eventually
-var doNotRedirect = new SitePile();
-var potentialSites = new SitePile();
-
 // Initialize stored values
 init();
 
+/* Site type
+
+site : The domain (or domain pattern) of the site
+status : One of 'secure', 'potential', 'blacklist'
+
+*/
+
 var API = {
-	'sitelist': function() {
+	'site.all': function() {
 		var rv = [];
-		SitePile.sites().each(function(site) {
-			rv.push(site);
+		jsonStorage.each(function(site, data) {
+			if (site[0] == '$') return;
+			data.site = site;
+			rv.push(data);
 		});
 		return rv;
 	},
-	'sitelist.add': function(args) {
-		var sp = SitePile.sites();
-		if (sp.add(args.site)) {
-			sp.saveLocal();
-			RaiseEvent('sitelist', 'add', {site:args.site});
-			API['potentials.del'](args);
-			redirectChanged();
+	'site.get': function(args) {
+		var site = jsonStorage.get(args.site);
+		if (site) {
+			site.site = args.site;
 		}
+		return site;
 	},
-	'sitelist.del': function(args) {
-		var sp = SitePile.sites();
-		if (sp.del(args.site)) {
-			sp.saveLocal();
-			RaiseEvent('sitelist', 'del', {site:args.site});
-			redirectChanged();
-		}
-	},
-	'sitelist.clear': function() {
-		var sp = SitePile.sites();
-		sp.clear();
-		sp.saveLocal();
-		RaiseEvent('sitelist', 'clear', {});
+	'site.add': function(args) {
+		console.assert(args.site[0] != '$');
+		console.assert(args.status);
+		if (jsonStorage.has(args.site)) return false;
+		jsonStorage.set(args.site, args);
+		RaiseEvent('site', 'new', args);
 		redirectChanged();
+		return true;
 	},
-	'sitelist.match': function(args) {
-		var sp = SitePile.sites();
-		return sp.match(args.site);
-	},
-	'potentials': function() {
-		var rv = [];
-		potentialSites.each(function(site) {
-			rv.push(site);
-		});
-		return rv;
-	},
-	'potentials.add': function(args) {
-		if (doNotRedirect.match(args.site)) {
-			return;
+	'site.set': function(args) {
+		console.assert(args.site[0] != '$');
+		console.assert(args.status);
+		var data = jsonStorage.get(args.site);
+		if (!data) return false;
+		var changed = false
+		for (k in args) {
+			if (k[0] == '$') continue;
+			if (data[k] != args[k]) {
+				data[k] = args[k];
+				changed = true;
+			}
 		}
-		if (potentialSites.add(args.site)) {
-			RaiseEvent('potentials', 'add', {site:args.site});
+		if (changed) {
+			jsonStorage.set(args.site, data);
+			RaiseEvent('site', 'set', data);
+			redirectChanged();
 		}
+		return true;
 	},
-	'potentials.del': function(args) {
-		if (potentialSites.del(args.site)) {
-			RaiseEvent('potentials', 'del', {site:args.site});
+	/// Does either an add or a set, depending on what's needed.
+	'site.makeItSo': function(args) {
+		console.assert(args.site[0] != '$');
+		console.assert(args.status);
+		var data = jsonStorage.get(args.site);
+		var added = false;
+		if (!data) {
+			data = {};
+			added = true;
 		}
-	},
-	'potentials.clear': function() {
-		potentialSites.clear();
-		RaiseEvent('potentials', 'clear', {});
-	},
-	'potentials.match': function(args) {
-		return potentialSites.match(args.site);
-	},
-	'blacklist': function() {
-		var rv = [];
-		doNotRedirect.each(function(site) {
-			rv.push(site);
-		});
-		return rv;
-	},
-	'blacklist.add': function(args) {
-		if (doNotRedirect.add(args.site)) {
-			RaiseEvent('blacklist', 'add', {site:args.site});
-			API['potentials.del'](args);
+		var changed = false
+		for (k in args) {
+			if (k[0] == '$') continue;
+			if (data[k] != args[k]) {
+				data[k] = args[k];
+				changed = true;
+			}
+		}
+		if (changed) {
+			jsonStorage.set(args.site, data);
+			if (added) {
+				RaiseEvent('site', 'add', data);
+			} else {
+				RaiseEvent('site', 'set', data);
+			}
 			redirectChanged();
 		}
+		return true;
 	},
-	'blacklist.del': function(args) {
-		if (doNotRedirect.del(args.site)) {
-			RaiseEvent('blacklist', 'del', {site:args.site});
+	'site.del': function(args) {
+		if (jsonStorage.del(args.site)) {
+			RaiseEvent('site', 'del', {site:args.site});
 			redirectChanged();
 		}
 	},
-	'blacklist.clear': function() {
-		doNotRedirect.clear();
-		RaiseEvent('blacklist', 'clear', {});
-		redirectChanged();
-	},
-	'blacklist.match': function(args) {
-		return doNotRedirect.match(args.site);
+	'site.match': function(args) {
+		//FIXME: Handle wildcards (GH-13)
+		return jsonStorage.get(args.site);
 	},
-	'clearAll': function() {
-		API['potentials.clear']();
-		API['blacklist.clear']();
+	'setting.get': function(args) {
+		return jsonStorage.get('$'+args.name);
 	},
-	'enabled': function() {
-		return !jsonStorage.get('is-disabled');
-	},
-	'enabled.set': function(args) {
-		var old = API.enabled();
+	'setting.set': function(args) {
+		var sname = '$'+args.name;
+		var old = jsonStorage.get(sname);
+		jsonStorage.set('$'+args.name, args.value)
 		if (old != args.value) {
-			jsonStorage.set('is-disabled', !args.value);
-			RaiseEvent('enabled', 'set', {value:args.value});
-			redirectChanged();
+			RaiseEvent('setting', 'set', {name:args.name, value:args.value});
+			return true;
+		} else {
+			return false;
 		}
 	},
+	'setting.del': function(args) {
+		var sname = '$'+args.name;
+		var had = jsonStorage.has(sname);
+		jsonStorage.del(sname)
+		if (had) {
+			RaiseEvent('setting', 'del', {name:args.name});
+		}
+	},
+	'setting.has': function(args) {
+		return jsonStorage.has('$'+args.name);
+	},
 	'haspotential': function(args, response) {
 		testUrlForHttps(args.site, function(hasit) {
 			response(hasit);
@@ -141,20 +148,13 @@
 
 var events = {
 	'*': [],
-	'sitelist': [],
-	'sitelist.add': [],
-	'sitelist.del': [],
-	'sitelist.clear': [],
-	'potentials': [],
-	'potentials.add': [],
-	'potentials.del': [],
-	'potentials.clear': [],
-	'blacklist': [],
-	'blacklist.add': [],
-	'blacklist.del': [],
-	'blacklist.clear': [],
-	'enabled': [],
-	'enabled.set': [],
+	'site': [],
+	'site.add': [],
+	'site.set': [],
+	'site.del': [],
+	'setting': [],
+	'setting.set': [],
+	'setting.del': [],
 };
 
 function onConnect(port) {
@@ -193,10 +193,11 @@
 }
 
 function UpdateAllTabs(site) {
+	var qi;
 	if (site && site.site) { // If it's an API event
 		site = site.site;
 	}
-	if (site) {
+	if (typeof site == 'string') {
 		qi = {url: '*://'+site+'/*'};
 	} else {
 		qi = {};
@@ -211,13 +212,21 @@
 
 function UpdateTab(tabId, url) {
 	var po = new ProtoOrigin(url);
-	var enabled = API.enabled();
-	var listed = API['sitelist.match']({site:po});
-	var blacklisted = API['blacklist.match']({site:po});
-	var potential = API['potentials.match']({site:po});
+	var enabled = API['setting.get']({name:'enabled'});
+	var site = API['site.match']({site:po.o});
+	
+	console.groupCollapsed("UpdateTab", tabId, url);
+	console.log("Enabled:", enabled);
+	console.log(site);
+	
+	if (!site) {
+		console.groupEnd();
+		return;
+	}
 	
 	// Blacklist: Show with pa_blacklist.html
-	// Secure, in list: Show with pa_secured.html
+	// Secure, https: Show with pa_secured.html
+	// Secure, http: Show with pa_broken.html
 	// Potential: Show with pa_potential.html
 	// Default: hide
 	// All cases: Gray if disabled
@@ -226,20 +235,24 @@
 //	var icon = 'chrome://extension-icon/'+chrome.i18n.getMessage('@@extension_id')+'/16/2';
 	var icon = 'lock';
 	const q = '?'+po.o;
-	
-	if (blacklisted) {
+	if (site.status == 'blacklist') {
 		console.log("Blacklist tab", po);
 		chrome.pageAction.setPopup({tabId: tabId, popup: 'pa_blacklisted.html'+q});
 		chrome.pageAction.setTitle({tabId: tabId, title: "Blacklisted"});
 		chrome.pageAction.show(tabId);
 		icon = 'blacklist';
-	} else if (po.isSecure() && listed) {
+	} else if (site.status == 'secure' && po.isSecure()) {
 		console.log("Secured tab", po);
 		chrome.pageAction.setPopup({tabId: tabId, popup: 'pa_secured.html'+q});
 		chrome.pageAction.setTitle({tabId: tabId, title: "Secured"});
 		chrome.pageAction.show(tabId);
 		icon = 'secure';
-	} else if (potential) {
+	} else if (site.status == 'secure' && !po.isSecure()) {
+		console.log("Broken tab", po);
+		chrome.pageAction.setPopup({tabId: tabId, popup: 'pa_broken.html'+q});
+		chrome.pageAction.setTitle({tabId: tabId, title: "Security Broken"});
+		chrome.pageAction.show(tabId);
+	} else if (site.status == 'potential') {
 		console.log("Potential tab", po);
 		chrome.pageAction.setPopup({tabId: tabId, popup: 'pa_potential.html'+q});
 		chrome.pageAction.setTitle({tabId: tabId, title: "Potential"});
@@ -252,6 +265,7 @@
 		icon = 'gray';
 	}
 	chrome.pageAction.setIcon({tabId: tabId, path: chrome.extension.getURL(icon+'-128.png')});
+	console.groupEnd();
 }
 
 chrome.tabs.onUpdated.addListener(function(tabId, info, tab) {
@@ -264,7 +278,7 @@
 	testUrlForHttps(po.o, function(hasHttps) {
 		if (hasHttps) {
 			console.log("Potential site: "+po.o);
-			API['potentials.add']({site:po.o});
+			API['site.set']({site:po.o, status:'potential'});
 		}
 	});
 }
@@ -274,8 +288,8 @@
 function onBeforeRequest(request) {
 	if (!request) return {}; // on handlerBehaviorChanged() 
 	
-	var isDisabled = jsonStorage.get('is-disabled');
-	if (isDisabled) return {};
+	var enabled = API['setting.get']({name:'enabled'});
+	if (!enabled) return {};
 	const rId = request.requestId;
 	if (!requests[rId]) {
 		requests[rId] = {};
@@ -287,25 +301,23 @@
 	var po = new ProtoOrigin(request.url);
 	if (!po.hasSecure()) return {};
 	
-	var siteInList = SitePile.sites().match(po);
+	var site = API['site.match']({site:po.o});
 	
-	if (!po.isSecure()) {
-		if (siteInList) {
-			if(!doNotRedirect.match(po)) {
-				var surl = po.makeSecure();
-				if (requests[rId][surl]) {
-					return {};
-				}
-				requests[rId][surl] = true;
-				console.log("Redirecting "+request.url+" to "+surl);
-				return {redirectUrl: surl}
-			} else {
-				console.log("Not redirecting: "+request.url)
+	if (!site) {
+		window.setTimeout(function() {
+			doPotentialSite(po);
+		}, 0);
+	} else if (po.hasSecure()) {
+		if (site.status == 'secure') {
+			var surl = po.makeSecure();
+			if (requests[rId][surl]) {
+				return {};
 			}
-		} else if (!(potentialSites.match(po) || doNotRedirect.match(po))) {
-			window.setTimeout(function() {
-				doPotentialSite(po);
-			}, 0);
+			requests[rId][surl] = true;
+			console.log("Redirecting "+request.url+" to "+surl);
+			return {redirectUrl: surl}
+		} else if (site.status == 'blacklist') {
+			console.log("Not redirecting: "+request.url)
 		}
 	}
 	return {};
@@ -332,22 +344,34 @@
 	chrome.webRequest.handlerBehaviorChanged(onBeforeRequest);
 }
 
+
+// Remove this after 3-28-2012
+function migrate() {
+	jsonStorage.set('$enabled', jsonStorage.get('is-disabled'));
+	jsonStorage.get('potential-sites').forEach(function(site) {
+		jsonStorage.set(site, {site: site, status: 'potential'});
+	});
+	jsonStorage.get('sites').forEach(function(site) {
+		jsonStorage.set(site, {site: site, status: 'secure'});
+	});
+	// Not migrating blacklist because we largely don't need it, and it's likely to cause problems
+	jsonStorage.del('is-disabled');
+	jsonStorage.del('enable-page-action');
+	jsonStorage.del('potential-sites');
+	jsonStorage.del('sites');
+	jsonStorage.del('do-not-redirect');
+}
+
 function init() {
-	jsonStorage.setDefault('sites', ["facebook.com", "twitter.com", "google.com", "wikipedia.org"]); 
-	jsonStorage.setDefault('is-disabled', false);
-	jsonStorage.setDefault('potential-sites', []);
-	jsonStorage.setDefault('do-not-redirect', []);
+	if (jsonStorage.has('sites')) {
+		migrate();
+	}
+	
+	jsonStorage.setDefault('$enabled', true);
 	
-	potentialSites = SitePile.getLocal('potential-sites');
-	doNotRedirect = SitePile.getLocal('do-not-redirect');
 	UpdateAllTabs();
 }
 
-window.setInterval(function() {
-	potentialSites.saveLocal();
-	doNotRedirect.saveLocal();
-}, 1000);
-
 var urlCache = {};
 //FIXME: Detect when a duplicate request comes in before the first finishes.
 function testUrlForHttps(url, callback) {
diff --git a/bin.png b/bin.png
new file mode 100644
index 0000000..ebad933
Binary files /dev/null and b/bin.png differ
diff --git a/icon-blacklist.png b/icon-blacklist.png
new file mode 100644
index 0000000..1be3797
Binary files /dev/null and b/icon-blacklist.png differ
diff --git a/icon-delete.png b/icon-delete.png
new file mode 100644
index 0000000..08f2493
Binary files /dev/null and b/icon-delete.png differ
diff --git a/icon-potential.png b/icon-potential.png
new file mode 100644
index 0000000..6332fef
Binary files /dev/null and b/icon-potential.png differ
diff --git a/icon-secure.png b/icon-secure.png
new file mode 100644
index 0000000..2ebc4f6
Binary files /dev/null and b/icon-secure.png differ
diff --git a/jsonstore.js b/jsonstore.js
index ecfd90e..649eee7 100644
--- a/jsonstore.js
+++ b/jsonstore.js
@@ -11,12 +11,10 @@ _JsonStorage.prototype = {
 		}
 	},
 	set: function(key, value) {
-		this[key] = value;
 		localStorage.setItem(key, JSON.stringify(value));
 	},
 	del: function(key) {
 		localStorage.removeItem(key);
-		this[key] = null;
 	},
 	has: function(key) {
 		return typeof localStorage[key] != "undefined";
diff --git a/options.css b/options.css
index a249334..d40653a 100644
--- a/options.css
+++ b/options.css
@@ -37,36 +37,29 @@ h1::before {
 	height:40px;
 }
 
-ul#sites {
-	list-style-type: none;
-	margin-left:0px;
-	text-indent: -2.5em;
-}
-
-#sites li {
-	margin-left:0px;
-	padding:1px;
+[data-status=potential] {
+    border-color: #2A2;
+    background: #AFA;
 }
 
-.blacklisted {
-	color: red;
+[data-status=blacklist] {
+    border-color:  #F22;
+    background: #FAA;
 }
 
-#potsites span, #dnr span {
+/* TODO: Figure out how to style image buttons */
+[data-site] td:not(.delete) {
+	opacity: 0.5;
 	cursor: pointer;
-    border: thin solid;
-    border-radius: 0.3em;
-    line-height: 1.4em;
-    padding: 0 0.3em;
-    white-space: nowrap;
 }
 
-#potsites span {
-    border-color: #2A2;
-    background: #EFE;
+td.delete {
+	cursor: pointer;
+	padding-left: 1em;
 }
 
-#dnr span {
-    border-color:  #F22;
-    background: #FEE;
+[data-status="secure"] .secure,
+[data-status="potential"] .potential,
+[data-status="blacklist"] .blacklist {
+	opacity: 1.0 !important;
 }
diff --git a/options.html b/options.html
index 4bb038f..eea7e3f 100644
--- a/options.html
+++ b/options.html
@@ -13,21 +13,35 @@
 	
 	<h1>Use HTTPS Options</h1>
 	
-	<h2>Current sites</h2>
-	<ul id="sites"></ul>
-	<button id="delete-sites">Delete</button> selected site(s)
-	
-	<h2>Add a site</h2>
-	Enter site: <input id="siteName" type="text" name="siteName" />
-	<button id="save-site">Save</button>
-	<button id="test-url-for-https">Test</button>
-	<div>Potential sites: <span id="potsites"></span></div>
-	<div>Blacklisted sites: <span id="dnr"></span></div>
-	<button id="clear-lists">Clear site lists</button>
+	<input id="is-disabled-input" type="checkbox">
+	<label for="is-disabled-input">Disable Use HTTPS</label>
 	
-	<h2>Additional Options</h2>
-	<input id="is-disabled-input" type=checkbox>
-	<label for="is-disabled-input">Disable all sites</label>
+	<h2>Current sites</h2>
+	<table id="sites">
+		<thead>
+			<tr>
+				<th colspan="2">Site</th>
+				<th colspan="3">Status</th>
+				<th><!--Delete--></th>
+			</tr>
+		</thead>
+		<tbody>
+		</tbody>
+		<tfoot>
+			<tr>
+				<th colspan="6">Add a site</th>
+			</tr>
+			<tr>
+				<td colspan="2">
+					<input id="siteName" type="text" name="siteName" placeholder="Site Name">
+				</td>
+				<td colspan="4">
+					<button id="save-site">Save</button>
+					<button id="test-url-for-https">Test</button>
+				</td>
+			</tr>
+		</tfoot>
+	</table>
 	
 	<h2>Messages</h2>
 	<div id='message'></div>
diff --git a/options.js b/options.js
index 6385189..a76986f 100644
--- a/options.js
+++ b/options.js
@@ -1,7 +1,4 @@
-function redirectChanged() {
-	chrome.extension.getBackgroundPage().redirectChanged();
-}
-
+//TODO: Add some indicator of working, based on a semaphore of tasks in progress
 function showMessage(msg) {
 	$('#message').text(msg);
 }
@@ -11,104 +8,65 @@ function appendMessage(msg) {
 }
 
 function mkSiteItem(site) {
-		//XXX: Use a templating thing?
-	var new_element = $("<li><input type='checkbox' name='" + site + "' value='" + site + "' />&nbsp;" + site+"</li>");
-	UseHttps.blacklist.match(site, (function(yup) {
-		if (yup)
-			this.addClass("blacklisted");
-	}).bind(new_element));
-	return new_element;
-}
-
-UseHttps.sitelist.connect('add', function(args) {
-	$('#sites').append(mkSiteItem(args.site));
-});
-
-UseHttps.sitelist.connect('del', function(args) {
-	$('#sites li input').filter(function(i) {
-		return $(this).attr('name') == args.site;
-	}).parent().remove();
-});
-
-UseHttps.sitelist.connect('clear', function(args) {
-	$('#sites').empty();
-});
-
-
-function addPotentialItem(site) {
-	$('#potsites').append($('<span title="Add"></span>').text(site).click(function() {
-		$('#siteName').val($(this).text());
-		$('#save-site').click();
-	}));
-	$('#potsites').append(' ');
+	//XXX: Use a templating thing?
+	var row = $("<tr></tr>").attr('data-site', site.site).attr('data-status', site.status)
+		.append($("<th><input type='checkbox'></th>"))
+		.append($("<th></th>").text(site.site))
+		.append($("<td class='secure' title='Secured'><img src='icon-secure.png'></td>"))
+		.append($("<td class='potential' title='Potential'><img src='icon-potential.png'></td>"))
+		.append($("<td class='blacklist' title='Blacklisted'><img src='icon-blacklist.png'></td>"))
+		.append($("<td class='delete' title='Delete Site'><img src='icon-delete.png'></td>"))
+		;
+	$('td', row).click(function(evt) {
+		var site = this.parentNode.attributes['data-site'].nodeValue;
+		if (this.className == 'delete') {
+			UseHttps.site.del(site);
+		} else if (this.className) {
+			UseHttps.site.set(site, {status: this.className});
+		}
+	});
+	return row;
 }
 
-UseHttps.potentials.connect('add', function(args) {
-	addPotentialItem(args.site);
-});
-
-UseHttps.potentials.connect('del', function(args) {
-	$('#potsites span').filter(function() { 
-		return $(this).text() == args.site;
-	}).remove();
-});
-
-UseHttps.potentials.connect('clear', function(args) {
-	$('#potsites').empty();
+UseHttps.site.connect('add', function(args) {
+	//TODO: Sorting
+	$('#sites tbody').append(mkSiteItem(args));
 });
 
-function addDnrItem(site) {
-	$('#dnr').append($('<span title="Remove"></span>').text(site).click(function() {
-		chrome.extension.getBackgroundPage().doNotRedirect.del($(this).text());
-		this.parentNode.removeChild(this);
-		viewSites();
-	}));
-	$('#dnr').append(' ');
-}
-
-UseHttps.blacklist.connect('add', function(args) {
-	addDnrItem(args.site);
+UseHttps.site.connect('set', function(args) {
+	$('#sites tbody tr').filter(function(i) {
+		return $(this).attr('data-site') == args.site;
+	}).attr('data-status', args.status);
 });
 
-UseHttps.blacklist.connect('del', function(args) {
-	$('#dnr span').filter(function() { 
-		return $(this).text() == args.site;
+UseHttps.site.connect('del', function(args) {
+	$('#sites tbody tr').filter(function(i) {
+		return $(this).attr('data-site') == args.site;
 	}).remove();
 });
 
-UseHttps.blacklist.connect('clear', function(args) {
-	$('#dnr').empty();
-});
-
 function viewSites() {
-	var sul = $('#sites');
-	sul.empty();
+	var sul = $('#sites tbody');
 	
-	UseHttps.sitelist.each(function(site) {
+	UseHttps.site.each(function(site) {
 		sul.append(mkSiteItem(site));
 	});
-	
-	$('#potsites').empty();
-	UseHttps.potentials.each(addPotentialItem);
-	
-	$('#dnr').empty();
-	UseHttps.blacklist.each(addDnrItem);
 }
 
-UseHttps.enabled.connect('set', function(args) {
-	$('#is-disabled-input').attr('checked', !args.value);
+UseHttps.setting.connect('set', function(args) {
+	if (args.name == 'enabled') {
+		$('#is-disabled-input').attr('checked', !args.value);
+	}
 });
 
-function init() {
-	
+$(function() {
 	viewSites();
 	
 	// Initialize sites enabled flag
-	UseHttps.enabled.get(function(yup) {
+	UseHttps.setting.get('enabled', function(yup) {
 		$('#is-disabled-input').attr('checked', !yup);
 	});
-}
-$(init);
+});
 
 $(function() {
 $('#save-site').click(function() {
@@ -121,46 +79,13 @@ $('#save-site').click(function() {
 	}
 	
 	// Check if we already have the new site
-	UseHttps.sitelist.add(site, function(added) {
+	UseHttps.site.add(site, {status:'secure'}, function(added) {
 		if (added) {
 			showMessage("Added " + site + " successfully");
 		} else {
 			showMessage(site + " is already protected");
 		}
 	});
-	
-	UseHttps.potentials.del(site);
-});
-
-$('#delete-sites').click(function() {
-	
-	var removedSites = [];
-	
-	$('#sites input:checked').each(function(i) {
-		var siteName = this.name;
-		UseHttps.sitelist.del(siteName);
-		removedSites.push(siteName);
-	});
-	
-	if(removedSites.length > 0 ) {
-		showMessage("Removed the following site(s): " + removedSites);
-	}
-});
-
-$('#is-disabled-input').click(function() {
-	
-	var isDisabled = $('#is-disabled-input').is(':checked');
-	
-	UseHttps.enabled.set(!isDisabled);
-	if(isDisabled) {
-		showMessage("Disabled 'Use HTTPS' for all site(s)");
-	} else {
-		showMessage("Enabled 'Use HTTPS' for all site(s)");
-	}
-});
-
-$('#clear-lists').click(function() {
-	UseHttps.clearAll();
 });
 
 $('#test-url-for-https').click(function() {
@@ -182,4 +107,14 @@ $('#test-url-for-https').click(function() {
 		}
 	});
 });
+
+$('#is-disabled-input').click(function() {
+	var isDisabled = $('#is-disabled-input').is(':checked');
+	UseHttps.setting.set('enabled', !isDisabled);
+	if(isDisabled) {
+		showMessage("Disabled 'Use HTTPS' for all site(s)");
+	} else {
+		showMessage("Enabled 'Use HTTPS' for all site(s)");
+	}
+});
 });