diff --git a/pandora/padma.json b/pandora/padma.json
index ec87d174..b7b56ad4 100644
--- a/pandora/padma.json
+++ b/pandora/padma.json
@@ -1,366 +1,302 @@
 {
-    "findKeys": [
-        {"id": "all", "title": "All"},
-        {"id": "title", "title": "Title", "autocomplete": true, "autocompleteSortKey": "votes"},
-        {"id": "director", "title": "Director", "autocomplete": true},
-        {"id": "country", "title": "Country", "autocomplete": true},
-        {"id": "year", "title": "Year", "autocomplete": true},
-        {"id": "language", "title": "Language", "autocomplete": true},
-        {"id": "writer", "title": "Writer", "autocomplete": true},
-        {"id": "producer", "title": "Producer", "autocomplete": true},
-        {"id": "cinematographer", "title": "Cinematographer", "autocomplete": true},
-        {"id": "editor", "title": "Editor", "autocomplete": true},
-        {"id": "actor", "title": "Actor", "autocomplete": true},
-        {"id": "character", "title": "Character", "autocomplete": true},
-        {"id": "name", "title": "Name", "autocomplete": true},
-        {"id": "genre", "title": "Genre", "autocomplete": true},
-        {"id": "keyword", "title": "Keyword", "autocomplete": true},
-        {"id": "summary", "title": "Summary"},
-        {"id": "dialog", "title": "Dialog"}
-    ],
     "groups": [
         {"id": "director", "title": "Director"},
-        {"id": "country", "title": "Country"},
+        {"id": "collection", "title": "Collection"},
         {"id": "year", "title": "Year"},
         {"id": "language", "title": "Language"},
-        {"id": "genre", "title": "Genre"},
-        {"id": "writer", "title": "Writer"},
-        {"id": "producer", "title": "Producer"},
+        {"id": "category", "title": "Category"},
+        {"id": "contributor", "title": "Contributor"},
         {"id": "cinematographer", "title": "Cinematographer"},
-        {"id": "editor", "title": "Editor"},
-        {"id": "actor", "title": "Actor"},
+        {"id": "source", "title": "Source"},
         {"id": "keyword", "title": "Keyword"}
     ],
     "itemKeys": [
-        {  
+        {
             "id": "title",
             "title": "Title",
             "type": "string",
-            "find": {"autocomplete": true, "autocompleteSortKey": "votes"},
-            "sort": {"removable": false, "type": "title", "width": 180}
+            "autocomplete": true,
+            "autocompleteSortKey": "popularity",
+            "columnRequired": true,
+            "columnWidth": 180,
+            "find": true,
+            "sort": "title"
         },
         {
             "id": "director",
             "title": "Director",
             "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"removable": false, "type": "person", "width": 180},
-            "group": true
+            "autocomplete": true,
+            "columnRequired": true,
+            "columnWidth": 180,
+            "find": true,
+            "group": true,
+            "sort": "person"
         },
         {
-            "id": "country",
-            "title": "Country",
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"type": "string", "width": 180},
+            "id": "collection",
+            "title": "Collection",
+            "type": "string",
+            "autocomplete": true,
+            "columnWidth": 120,
+            "find": true,
             "group": true
         },
         {
             "id": "year",
             "title": "Year",
             "type": "year",
-            "find": {"autocomplete": true},
-            "sort": {"type": "year", "width": 180},
+            "autocomplete": true,
+            "columnWidth": 60,
+            "find": true,
             "group": true
         },
         {
             "id": "language",
             "title": "Language",
             "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"type": "string", "width": 180},
+            "autocomplete": true,
+            "columnWidth": 120,
+            "find": true,
             "group": true
         },
-        {
-            "id": "writer",
-            "title": "Writer",
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"type": "person", "width": 180},
-            "group": true
-        },
-        {
-            "id":
-            "producer",
-            "type": ["string"],
-            "title": "Producer",
-            "find": {"autocomplete": true},
-            "sort": {"type": "person", "width": 180},
-            "group": true
-        },
-        {
-            "id": "cinematographer",
-            "title": "Cinematographer",
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"type": "person", "width": 180},
-            "group": true
-        },
-        {
-            "id": "editor",
-            "title": "Editor",
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"type": "person", "width": 180},
-            "group": true
-        },
-        {
-            "id": "actor",
-            "title": "Actor", 
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "group": true
-        },
-        {
-            "id": "character", 
-            "title": "Character", 
-            "type": ["string"],
-            "find": {"autocomplete": true}
-        },
-        {
-            "id": "name",
-            "title": "Name", 
-            "type": ["string"],
-            "find": {"autocomplete": true}
-        },
-        {
-            "id": "numberofactors",
-            "title": "Number of Actors",
-            "sort": {"type": "integer", "width": 60},
-            "value": {"key": "actor", "type": "length"},
-            "type": "integer"
-        },
-        {
-            "id": "genre", 
-            "title": "Genre", 
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "sort": {"type": "string", "width": 180},
-            "group": true
-        },
-        {
-            "id": "keyword", 
-            "title": "Keyword", 
-            "type": ["string"],
-            "find": {"autocomplete": true},
-            "group": true
-        },
-        {
-            "id": "numberofkeywords", 
-            "title": "Number of Keyword", 
-            "type": "integer",
-            "sort": {"type": "integer", "width": 60},
-            "value": {"key": "keyword", "type": "length"}
-        },
         {
             "id": "runtime", 
             "title": "Runtime", 
             "type": "integer",
-            "sort": {"type": "integer", "width": 60},
+            "columnWidth": 60,
             "format": {"type": "duration", "args": [0, "medium"]}
         },
         {
-            "id": "summary",
-            "title": "Summary",
-            "type": "text",
-            "group": false,
-            "find": {}
+            "id": "source",
+            "title": "Source",
+            "type": "string",
+            "autocomplete": true,
+            "columnWidth": 180,
+            "find": true,
+            "group": true
         },
         {
-            "id": "dialog",
-            "title": "Dialog",
+            "id": "genre", 
+            "title": "Genre",
+            "type": ["string"],
+            "autocomplete": true,
+            "columnWidth": 120,
+            "find": true,
+            "group": true
+        },
+        {
+            "id": "keyword", 
+            "title": "Keyword",
+            "type": ["string"],
+            "autocomplete": true,
+            "find": true,
+            "group": true
+        },
+        {
+            "id": "numberofkeywords", 
+            "title": "Number of Keywords", 
+            "type": "integer",
+            "columnWidth": 60,
+            "value": {"key": "keyword", "type": "length"}
+        },
+        {
+            "id": "description",
+            "title": "Description",
             "type": "text",
-            "group": false,
-            "find": {}
+            "find": true
         },
         {
             "id": "wordsinsummary",
             "title": "Words in Summary",
-            "sort": {"type": "integer", "width": 60},
             "type": "integer",
-            "value": {"key": "summary", "type": "words"}
-        },
-        {
-            "id": "wordsintrivia",
-            "title": "Words in Trivia",
-            "type": "integer",
-            "sort": {"type": "integer", "width": 60},
-            "value": {"key": "trivia", "type": "words"}
+            "columnWidth": 60,
+            "value": {"key": "description", "type": "words"}
         },
         {
             "id": "releasedate",
             "title": "Release Date",
-            "sort": {"type": "date", "width": 120},
             "type": "date",
+            "columnWidth": 120,
             "format": {"type": "date", "args": ["%a, %b %e, %Y"]}
         },
-        {
-            "id": "budget",
-            "title": "Budget",
-            "sort": {"type": "integer", "width": 90},
-            "type": "integer",
-            "format": {"type": "currency", "args": ["$", 0]}
-        },
-        {
-            "id": "gross",
-            "title": "Gross",
-            "sort": {"type": "integer", "width": 90},
-            "type": "integer",
-            "format": {"type": "currency", "args": ["$", 0]}
-        },
-        {
-            "id": "profit",
-            "title": "Profit",
-            "sort": {"type": "integer", "width": 90},
-            "type": "integer",
-            "format": {"type": "currency", "args": ["$", 0]}
-        },
-        {
-            "id": "rating",
-            "title": "Rating",
-            "sort": {"type": "float", "width": 60},
-            "type": "float",
-            "format": {"type": "percent", "args": [10, 2]}
-        },
-        {
-            "id": "votes",
-            "title": "Votes",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer",
-            "format": {"type": "percent", "args": [403824, 2]}
-        },
         {
             "id": "id",
             "title": "ID",
-            "sort": {"type": "string", "width": 90},
-            "type": "string"
+            "type": "string",
+            "columnWidth": 90
         },
         {
-            "id": "aspectratio",
-            "title": "Aspect Ratio",
-            "sort": {"type": "float", "width": 90},
-            "type": "float"
+            "id": "location",
+            "title": "Locations",
+            "type": "layer",
+            "find": true
+        },
+        {
+            "id": "keyword",
+            "title": "Keywords",
+            "type": "layer",
+            "find": true
+        },
+        {
+            "id": "description",
+            "title": "Descriptions",
+            "type": "layer",
+            "find": true
+        },
+        {
+            "id": "transcript",
+            "title": "Transcripts",
+            "type": "layer",
+            "find": true
         },
         {
             "id": "duration",
             "title": "Duration",
-            "sort": {"type": "float", "width": 90},
-            "type": "float"
-        },
-        {
-            "id": "color",
-            "title": "Color",
-            "sort": {"type": "float", "width": 90},
-            "type": "float"
-        },
-        {
-            "id": "saturation",
-            "title": "Saturation",
-            "sort": {"type": "float", "width": 60},
-            "type": "float"
-        },
-        {
-            "id": "brightness",
-            "title": "Brightness",
-            "sort": {"type": "float", "width": 60},
-            "type": "float"
-        },
-        {
-            "id": "volume",
-            "title": "Volume",
-            "sort": {"type": "float", "width": 60},
-            "type": "float"
-        },
-        {
-            "id": "clips",
-            "title": "Clips",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer"
-        },
-        {
-            "id": "cuts",
-            "title": "Cuts",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer"
-        },
-        {
-            "id": "cutsperminute",
-            "title": "Cuts per Minute",
-            "sort": {"type": "float", "width": 60},
-            "type": "float"
-        },
-        {
-            "id": "words",
-            "title": "Words",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer"
-        },
-        {
-            "id": "wordsperminute",
-            "title": "Words per Minute",
-            "sort": {"type": "float", "width": 60},
-            "type": "float"
+            "type": "float",
+            "columnWidth": 90,
+            "format": {"type": "duration", "args": [0, "short"]}
         },
         {
             "id": "resolution",
             "title": "Resolution",
-            "sort": {"type": "integer", "width": 90},
-            "type": "integer"
+            "type": ["integer"],
+            "columnWidth": 90
+        },
+        {
+            "id": "aspectratio",
+            "title": "Aspect Ratio",
+            "type": "float",
+            "columnWidth": 90,
+            "format": {"type": "unit", "args": [":1"]}
         },
         {
             "id": "pixels",
             "title": "Pixels",
             "type": "integer",
-            "group": false,
-            "sort": {"type": "integer", "width": 60},
-            "auto": true
+            "columnWidth": 90,
+            "format": {"type": "value", "args": ["px"]}
+        },
+        {
+            "id": "hue",
+            "title": "Hue",
+            "type": "hue",
+            "columnWidth": 90,
+            "format": {"type": "color", "args": ["hue"]}
+        },
+        {
+            "id": "saturation",
+            "title": "Saturation",
+            "type": "float",
+            "columnWidth": 90,
+            "format": {"type": "color", "args": ["greyscale"]}
+        },
+        {
+            "id": "lightness",
+            "title": "Lightness",
+            "type": "float",
+            "columnWidth": 90,
+            "format": {"type": "color", "args": ["greyscale"]}
+        },
+        {
+            "id": "volume",
+            "title": "Volume",
+            "type": "float",
+            "columnWidth": 60
+        },
+        {
+            "id": "numberofcuts",
+            "title": "Number of Cuts",
+            "type": "integer",
+            "columnWidth": 60,
+            "value": {"key": "cuts", "type": "length"}
+        },
+        {
+            "id": "cutsperminute",
+            "title": "Cuts per Minute",
+            "type": "float",
+            "columnWidth": 60,
+            "value": {"key": "cuts", "type": "lengthperminute"}
+        },
+        {
+            "id": "words",
+            "title": "Words",
+            "type": "integer",
+            "columnWidth": 60,
+            "value": {"layer": "subtitles", "type": "words"}
+        },
+        {
+            "id": "wordsperminute",
+            "title": "Words per Minute",
+            "type": "float",
+            "columnWidth": 60,
+            "value": {"layer": "subtitles", "type": "wordsperminute"}
         },
         {
             "id": "size",
             "title": "Size",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer"
+            "type": "integer",
+            "columnWidth": 60,
+            "format": {"type": "value", "args": ["B"]},
+            "rightsLevel": 1
         },
         {
             "id": "bitrate",
             "title": "Bitrate",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer"
+            "type": "integer",
+            "columnWidth": 60,
+            "format": {"type": "unit", "args": ["kbps"]}
         },
         {
-            "id": "files",
-            "title": "Files",
-            "sort": {"type": "integer", "width": 60},
-            "type": "integer"
+            "id": "numberoffiles",
+            "title": "Number of Files",
+            "type": "integer",
+            "columnWidth": 60,
+            "value": {"key": "files", "type": "length"},
+            "rightsLevel": 1
         },
         {
             "id": "filename",
             "title": "Filename",
-            "sort": {"type": "string", "width": 180},
-            "type": "string"
+            "type": ["string"],
+            "find": true,
+            "rightsLevel": 1
         },
         {
             "id": "published",
             "title": "Date Published",
-            "sort": {"type": "date", "width": 90},
-            "type": "date"
+            "type": "date",
+            "columnWidth": 90
         },
         {
             "id": "modified",
             "title": "Date Modified",
-            "sort": {"type": "date", "width": 90},
-            "type": "date"
+            "type": "date",
+            "columnWidth": 90
+        },
+        {
+            "id": "accessed",
+            "title": "Date Accessed",
+            "type": "date",
+            "columnWidth": 90
+        },
+        {
+            "id": "viewed",
+            "title": "Date Viewed",
+            "type": "date",
+            "columnWidth": 90
         },
         {
             "id": "popularity",
             "title": "Popularity",
-            "sort": {"type": "float", "width": 60},
-            "type": "float"
+            "type": "integer",
+            "columnWidth": 60,
+            "format": {"type": "percent", "args": ["auto", 2]}
         }
     ],
     "itemName": {
-        "singular": "Movie",
-        "plural": "Movies"
+        "singular": "Video",
+        "plural": "Videos"
     },
     "itemViews": [
         {"id": "info", "title": "Info"},
@@ -373,8 +309,31 @@
         {"id": "files", "title": "Files", "admin": true}
     ],
     "layers": [
-        {"id": "privatenotes", "title": "Private Notes", "type": "text", "private": true},
-        {"id": "publicnotes", "title": "Public Notes", "type": "text"}
+        {
+            "id": "location",
+            "title": "Locations",
+            "type": "location",
+            "overlap": true,
+            "private": true
+        },
+        {
+            "id": "keyword",
+            "title": "Keywords",
+            "overlap": true,
+            "type": "text"
+        },
+        {
+            "id": "description",
+            "title": "Descriptions",
+            "type": "text",
+            "overlay": true
+        },
+        {
+            "id": "transcript",
+            "title": "Transcripts",
+            "type": "text",
+            "overlay": true
+        }
     ],
     "listViews": [
         {"id": "list", "title": "as List"},
@@ -399,51 +358,8 @@
         {"id": "news", "title": "News"},
         {"id": "tour", "title": "Take a Tour"},
         {"id": "faq", "title": "Frequently Asked Questions"},
-        {"id": "terms", "title": "Terms of Service"}
-    ],
-    "sortKeys": [
-        {"id": "title", "title": "Title", "width": 180, "removable": false, "type": "title"},
-        {"id": "director", "title": "Director", "width": 180, "removable": false, "type": "person"},
-        {"id": "country", "title": "Country", "width": 120, "type": "string"},
-        {"id": "year", "title": "Year", "width": 60, "type": "year"},
-        {"id": "language", "title": "Language", "width": 120, "type": "string"},
-        {"id": "runtime", "title": "Runtime", "width": 60, "type": "integer", "format": {"type": "duration", "args": [0, "medium"]}},
-        {"id": "writer", "title": "Writer", "width": 180, "type": "person"},
-        {"id": "producer", "title": "Producer", "width": 180, "type": "person"},
-        {"id": "cinematographer", "title": "Cinematographer", "width": 180, "type": "person"},
-        {"id": "editor", "title": "Editor", "width": 180, "type": "person"},
-        {"id": "numberofactors", "title": "Number of Actors", "width": 60, "key": "actor", "type": "length"},
-        {"id": "genre", "title": "Genre", "width": 120, "type": "string"},
-        {"id": "numberofkeywords", "title": "Number of Keywords", "width": 60, "key": "keyword", "type": "length"},
-        {"id": "wordsinsummary", "title": "Words in Summary", "width": 60, "key": "summary", "type": "words"},
-        {"id": "wordsintrivia", "title": "Words in Trivia", "width": 60, "key": "trivia", "type": "words"},
-        {"id": "releasedate", "title": "Release Date", "width": 120, "type": "date", "format": {"type": "date", "args": ["%a, %b %e, %Y"]}},
-        {"id": "budget", "title": "Budget", "width": 90, "type": "integer", "format": {"type": "currency", "args": ["$", 0]}},
-        {"id": "gross", "title": "Gross", "width": 90, "type": "integer", "format": {"type": "currency", "args": ["$", 0]}},
-        {"id": "profit", "title": "Profit", "width": 90, "type": "integer", "format": {"type": "currency", "args": ["$", 0]}},
-        {"id": "rating", "title": "Rating", "width": 60, "type": "float", "format": {"type": "percent", "args": [10, 2]}},
-        {"id": "votes", "title": "Votes", "width": 60, "type": "integer", "format": {"type": "percent", "args": [403824, 2]}},
-        {"id": "id", "title": "ID", "width": 90, "type": "string"},
-        {"id": "aspectratio", "title": "Aspect Ratio", "width": 90, "type": "float"},
-        {"id": "duration", "title": "Duration", "width": 90, "type": "float"},
-        {"id": "color", "title": "Color", "width": 90, "type": "float"},
-        {"id": "saturation", "title": "Saturation", "width": 60, "type": "float"},
-        {"id": "brightness", "title": "Brightness", "width": 60, "type": "float"},
-        {"id": "volume", "title": "Volume", "width": 60, "type": "float"},
-        {"id": "clips", "title": "Clips", "width": 60, "type": "integer"},
-        {"id": "cuts", "title": "Cuts", "width": 60, "type": "integer"},
-        {"id": "cutsperminute", "title": "Cuts per Minute", "width": 60, "type": "float"},
-        {"id": "words", "title": "Words", "width": 60, "type": "integer"},
-        {"id": "wordsperminute", "title": "Words per Minute", "width": 60, "type": "float"},
-        {"id": "resolution", "title": "Resolution", "width": 90, "type": "integer"},
-        {"id": "pixels", "title": "Pixels", "width": 90, "type": "integer"},
-        {"id": "size", "title": "Size", "width": 90, "type": "integer"},
-        {"id": "bitrate", "title": "Bitrate", "width": 90, "type": "integer"},
-        {"id": "files", "title": "Files", "width": 60, "type": "integer"},
-        {"id": "filename", "title": "Filename", "width": 180, "type": "string"},
-        {"id": "published", "title": "Date Published", "width": 90, "type": "date"},
-        {"id": "modified", "title": "Date Modified", "width": 90, "type": "date"},
-        {"id": "popularity", "title": "Popularity", "type": "float"}
+        {"id": "terms", "title": "Terms of Service"},
+        {"id": "license", "title": "License"}
     ],
     "totals": [
         {"id": "items"},
@@ -479,7 +395,7 @@
             "annotationsSize": 256,
             "findKey": "",
             "findQuery": {"conditions": [], "operator": ""},
-            "groups": ["director", "country", "year", "language", "genre"],
+            "groups": ["director", "collection", "source", "language", "category"],
             "groupsQuery": {"conditions": [], "operator": "|"},
             "groupsSize": 176,
             "item": "",
@@ -488,7 +404,7 @@
             "listQuery": {"conditions": [], "operator": ""},
             "lists": {
                 "": {
-                    "columns": ["id", "title", "director", "country", "year", "language", "runtime", "genre"],
+                    "columns": ["title", "director", "country", "year", "language", "runtime", "genre"],
                     "columnWidth": {},
                     "listView": "icons",
                     "selected": [],
@@ -524,5 +440,6 @@
             "videoSize": "small"
         },
         "username": ""
-    }
+    },
+    "userLevels": ["guest", "member", "staff", "admin"]
 }
diff --git a/pandora/templates/admin/base_site.html b/pandora/templates/admin/base_site.html
index e85a786b..82e70ad9 100644
--- a/pandora/templates/admin/base_site.html
+++ b/pandora/templates/admin/base_site.html
@@ -1,10 +1,10 @@
 {% extends "admin/base.html" %}
 {% load i18n %}
 
-{% block title %}{{ title }} | pan.do/ra{% endblock %}
+{% block title %}{{ title }} | Pan.do/ra{% endblock %}
 
 {% block branding %}
-<h1 id="site-name">0xdb.org</h1>
+<h1 id="site-name">Pan.do/ra</h1>
 {% endblock %}
 
 {% block nav-global %}{% endblock %}