diff --git a/README.md b/README.md
index ba4eb11e8..7018c76a1 100644
--- a/README.md
+++ b/README.md
@@ -1,27 +1,26 @@
 to prepare a new host:
 
 ```
-sudo apt-get install software-properties-common
-sudo apt-add-repository -y ppa:nginx/stable
 sudo apt-get update
-sudo apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev
-sudo apt-get install -y nginx-full
+sudo apt-get install -y git python-virtualenv python-dev phantomjs libjpeg8 libjpeg62-dev libfreetype6 libfreetype6-dev libevent-dev gdebi-core
 ```
 
 check out the code:
 
 ```
 git clone https://bitbucket.org/yackob03/quay.git
+cd quay
 virtualenv --distribute venv
 source venv/bin/activate
 pip install -r requirements.txt
+sudo gdebi --n binary_dependencies/*.deb
 ```
 
 running:
 
 ```
-sudo nginx -c `pwd`/nginx.conf
-STACK=prod gunicorn -D --workers 4 -b unix:/tmp/gunicorn.sock --worker-class gevent -t 2000 application:application
+sudo mkdir -p /mnt/nginx/ && sudo /usr/local/nginx/sbin/nginx -c `pwd`/nginx.conf
+STACK=prod gunicorn -c gunicorn_config.py application:application
 ```
 
 start the workers:
diff --git a/auth/auth.py b/auth/auth.py
index c4a17b080..11680cfee 100644
--- a/auth/auth.py
+++ b/auth/auth.py
@@ -34,7 +34,7 @@ def process_basic_auth(auth):
   if len(credentials) != 2:
     logger.debug('Invalid basic auth credential format.')
 
-  if credentials[0] == '$token':
+  elif credentials[0] == '$token':
     # Use as token auth
     try:
       token = model.load_token_data(credentials[1])
@@ -77,7 +77,6 @@ def process_basic_auth(auth):
 
   # We weren't able to authenticate via basic auth.
   logger.debug('Basic auth present but could not be validated.')
-  abort(401)
 
 
 def process_token(auth):
diff --git a/binary_dependencies/nginx_1.4.2-nobuffer-1_amd64.deb b/binary_dependencies/nginx_1.4.2-nobuffer-1_amd64.deb
new file mode 100644
index 000000000..7f3119b61
Binary files /dev/null and b/binary_dependencies/nginx_1.4.2-nobuffer-1_amd64.deb differ
diff --git a/buildserver/Dockerfile b/buildserver/Dockerfile
index 0a190a7cd..967e3e105 100644
--- a/buildserver/Dockerfile
+++ b/buildserver/Dockerfile
@@ -22,5 +22,5 @@ RUN venv/bin/pip install -r requirements.txt
 
 VOLUME /var/lib/docker
 
-EXPOSE 5002:5002
+EXPOSE 5002
 CMD startserver
\ No newline at end of file
diff --git a/buildserver/buildserver.py b/buildserver/buildserver.py
index 1b159173b..c661c079f 100644
--- a/buildserver/buildserver.py
+++ b/buildserver/buildserver.py
@@ -6,10 +6,9 @@ import re
 import requests
 import json
 
-from flask import Flask, jsonify, url_for, abort, make_response
+from flask import Flask, jsonify, abort, make_response
 from zipfile import ZipFile
 from tempfile import TemporaryFile, mkdtemp
-from uuid import uuid4
 from multiprocessing.pool import ThreadPool
 from base64 import b64encode
 
@@ -53,16 +52,24 @@ def prepare_dockerfile(request_file):
   return build_dir
 
 
+def total_completion(statuses, total_images):
+  percentage_with_sizes = float(len(statuses.values()))/total_images
+  sent_bytes = sum([status[u'current'] for status in statuses.values()])
+  total_bytes = sum([status[u'total'] for status in statuses.values()])
+  return float(sent_bytes)/total_bytes*percentage_with_sizes
+
+
 def build_image(build_dir, tag_name, num_steps, result_object):
   try:
     logger.debug('Starting build.')
-    docker_cl = docker.Client(version='1.5')
+    docker_cl = docker.Client(timeout=1200)
     result_object['status'] = 'building'
-    build_status = docker_cl.build(path=build_dir, tag=tag_name)
+    build_status = docker_cl.build(path=build_dir, tag=tag_name, stream=True)
 
     current_step = 0
     built_image = None
     for status in build_status:
+      # logger.debug('Status: %s', str(status))
       step_increment = re.search(r'Step ([0-9]+) :', status)
       if step_increment:
         current_step = int(step_increment.group(1))
@@ -84,40 +91,36 @@ def build_image(build_dir, tag_name, num_steps, result_object):
       result_object['message'] = 'Unable to build dockerfile.'
       return
 
-    history = docker_cl.history(built_image)
+    history = json.loads(docker_cl.history(built_image))
     num_images = len(history)
     result_object['total_images'] = num_images
 
     result_object['status'] = 'pushing'
     logger.debug('Pushing to tag name: %s' % tag_name)
-    resp = docker_cl.push(tag_name)
+    resp = docker_cl.push(tag_name, stream=True)
 
-    current_image = 0
-    image_progress = 0
-    for status in resp:
+    for status_str in resp:
+      status = json.loads(status_str)
+      logger.debug('Status: %s', status_str)
       if u'status' in status:
         status_msg = status[u'status']
-        next_image = r'(Pushing|Image) [a-z0-9]+( already pushed, skipping)?$'
-        match = re.match(next_image, status_msg)
-        if match:
-          current_image += 1
-          image_progress = 0
-          logger.debug('Now pushing image %s/%s' %
-                       (current_image, num_images))
 
-        elif status_msg == u'Pushing' and u'progress' in status:
-          percent = r'\(([0-9]+)%\)'
-          match = re.search(percent, status[u'progress'])
-          if match:
-            image_progress = int(match.group(1))
+        if status_msg == 'Pushing':
+          if u'progressDetail' in status and u'id' in status:
+            image_id = status[u'id']
+            detail = status[u'progressDetail']
 
-        result_object['current_image'] = current_image
-        result_object['image_completion_percent'] = image_progress
+            if u'current' in detail and 'total' in detail:
+              images = result_object['image_completion']
+
+              images[image_id] = detail
+              result_object['push_completion'] = total_completion(images,
+                                                                  num_images)
 
       elif u'errorDetail' in status:
         result_object['status'] = 'error'
         if u'message' in status[u'errorDetail']:
-          result_object['message'] = status[u'errorDetail'][u'message']
+          result_object['message'] = str(status[u'errorDetail'][u'message'])
         return
 
     result_object['status'] = 'complete'
@@ -133,15 +136,14 @@ MIME_PROCESSORS = {
   'application/octet-stream': prepare_dockerfile,
 }
 
-
+# If this format it should also be changed in the api method get_repo_builds
 build = {
   'total_commands': None,
-  'total_images': None,
   'current_command': None,
-  'current_image': None,
-  'image_completion_percent': None,
+  'push_completion': 0.0,
   'status': 'waiting',
   'message': None,
+  'image_completion': {},
 }
 pool = ThreadPool(1)
 
diff --git a/config.py b/config.py
index 4e20fdc8c..cf56eb1c8 100644
--- a/config.py
+++ b/config.py
@@ -127,6 +127,7 @@ class DigitalOceanConfig(object):
   DO_SSH_KEY_ID = '46986'
   DO_SSH_PRIVATE_KEY_FILENAME = 'certs/digital_ocean'
   DO_ALLOWED_REGIONS = {1, 4}
+  DO_DOCKER_IMAGE = 1341147
 
 
 class BuildNodeConfig(object):
diff --git a/data/database.py b/data/database.py
index 6e1784db7..49e1d607e 100644
--- a/data/database.py
+++ b/data/database.py
@@ -167,7 +167,9 @@ class Image(BaseModel):
   checksum = CharField(null=True)
   created = DateTimeField(null=True)
   comment = TextField(null=True)
+  command = TextField(null=True)
   repository = ForeignKeyField(Repository)
+  image_size = BigIntegerField(null=True)
 
   # '/' separated list of ancestory ids, e.g. /1/2/6/7/10/
   ancestors = CharField(index=True, default='/', max_length=64535)
diff --git a/data/model.py b/data/model.py
index 629d06700..7b300bedc 100644
--- a/data/model.py
+++ b/data/model.py
@@ -6,12 +6,14 @@ import operator
 import json
 
 from datetime import timedelta
+
 from database import *
 from util.validation import *
 from util.names import format_robot_username
 
 
 logger = logging.getLogger(__name__)
+store = app.config['STORAGE']
 
 
 class DataModelException(Exception):
@@ -306,12 +308,18 @@ def create_federated_user(username, email, service_name, service_id):
   return new_user
 
 
+def attach_federated_login(user, service_name, service_id):
+  service = LoginService.get(LoginService.name == service_name)
+  FederatedLogin.create(user=user, service=service, service_ident=service_id)
+  return user
+
+
 def verify_federated_login(service_name, service_id):
   selected = FederatedLogin.select(FederatedLogin, User)
   with_service = selected.join(LoginService)
   with_user = with_service.switch(FederatedLogin).join(User)
   found = with_user.where(FederatedLogin.service_ident == service_id,
-                             LoginService.name == service_name)
+                          LoginService.name == service_name)
 
   found_list = list(found)
 
@@ -321,14 +329,25 @@ def verify_federated_login(service_name, service_id):
   return None
 
 
+def list_federated_logins(user):
+  selected = FederatedLogin.select(FederatedLogin.service_ident,
+                                   LoginService.name)
+  joined = selected.join(LoginService)
+  return joined.where(LoginService.name != 'quayrobot',
+                      FederatedLogin.user == user)
+
+
 def create_confirm_email_code(user):
   code = EmailConfirmation.create(user=user, email_confirm=True)
   return code
 
 
 def confirm_user_email(code):
-  code = EmailConfirmation.get(EmailConfirmation.code == code,
-                               EmailConfirmation.email_confirm == True)
+  try:
+    code = EmailConfirmation.get(EmailConfirmation.code == code,
+                                 EmailConfirmation.email_confirm == True)
+  except EmailConfirmation.DoesNotExist:
+    raise DataModelException('Invalid email confirmation code.')
 
   user = code.user
   user.verified = True
@@ -345,6 +364,9 @@ def create_reset_password_email_code(email):
   except User.DoesNotExist:
     raise InvalidEmailAddressException('Email address was not found.');
 
+  if user.organization:
+    raise InvalidEmailAddressException('Organizations can not have passwords.')
+
   code = EmailConfirmation.create(user=user, pw_reset=True)
   return code
 
@@ -383,7 +405,6 @@ def get_matching_teams(team_prefix, organization):
 
 def get_matching_users(username_prefix, robot_namespace=None,
                        organization=None):
-  Org = User.alias()
   direct_user_query = (User.username ** (username_prefix + '%') & 
                        (User.organization == False) & (User.robot == False))
 
@@ -393,14 +414,16 @@ def get_matching_users(username_prefix, robot_namespace=None,
                          (User.username ** (robot_prefix + '%') & 
                           (User.robot == True)))
 
-  query = User.select(User.username, Org.username, User.robot).where(direct_user_query)
+  query = (User
+    .select(User.username, fn.Sum(Team.id), User.robot)
+    .group_by(User.username)
+    .where(direct_user_query))
 
   if organization:
-    with_team = query.join(TeamMember, JOIN_LEFT_OUTER).join(Team,
-                                                             JOIN_LEFT_OUTER)
-    with_org = with_team.join(Org, JOIN_LEFT_OUTER,
-                              on=(Org.id == Team.organization))
-    query = with_org.where((Org.id == organization) | (Org.id >> None))
+    query = (query
+      .join(TeamMember, JOIN_LEFT_OUTER)
+      .join(Team, JOIN_LEFT_OUTER, on=((Team.id == TeamMember.team) &
+                                       (Team.organization == organization))))
 
 
   class MatchingUserResult(object):
@@ -408,7 +431,7 @@ def get_matching_users(username_prefix, robot_namespace=None,
       self.username = args[0]
       self.is_robot = args[2]
       if organization:
-        self.is_org_member = (args[1] == organization.username)
+        self.is_org_member = (args[1] != None)
       else:
         self.is_org_member = None
 
@@ -489,13 +512,23 @@ def get_user_teams_within_org(username, organization):
                       User.username == username)
 
 
-def get_visible_repositories(username=None, include_public=True, limit=None,
+def get_visible_repository_count(username=None, include_public=True, sort=False, namespace=None):
+  return get_visible_repository_internal(username=username, include_public=include_public,
+                                         sort=sort, namespace=namespace, get_count=True)
+
+def get_visible_repositories(username=None, include_public=True, page=None, limit=None,
                              sort=False, namespace=None):
+  return get_visible_repository_internal(username=username, include_public=include_public, page=page,
+                                         limit=limit, sort=sort, namespace=namespace, get_count=False)
+
+
+def get_visible_repository_internal(username=None, include_public=True, limit=None, page=None,
+                             sort=False, namespace=None, get_count=False):
   if not username and not include_public:
     return []
 
   query = (Repository
-             .select(Repository, Visibility)
+             .select()  # Note: We need to leave this blank for the get_count case. Otherwise, MySQL/RDS complains.
              .distinct()
              .join(Visibility)
              .switch(Repository)
@@ -543,10 +576,19 @@ def get_visible_repositories(username=None, include_public=True, limit=None,
     else:
       where_clause = new_clause
 
-  if limit:
-    query.limit(limit)
+  if sort:
+    query = query.order_by(Repository.description.desc())
 
-  return query.where(where_clause)
+  if page:
+    query = query.paginate(page, limit)
+  elif limit:
+    query = query.limit(limit)
+
+  where = query.where(where_clause)
+  if get_count:
+    return where.count()
+  else:
+    return where
 
 
 def get_matching_repositories(repo_term, username=None):
@@ -702,8 +744,23 @@ def set_image_checksum(docker_image_id, repository, checksum):
   return fetched
 
 
+def set_image_size(docker_image_id, namespace_name, repository_name, image_size):
+  joined = Image.select().join(Repository)
+  image_list = list(joined.where(Repository.name == repository_name,
+                                 Repository.namespace == namespace_name,
+                                 Image.docker_image_id == docker_image_id))
+
+  if not image_list:
+    raise DataModelException('No image with specified id and repository')
+
+  fetched = image_list[0]
+  fetched.image_size = image_size
+  fetched.save()
+  return fetched
+
+
 def set_image_metadata(docker_image_id, namespace_name, repository_name,
-                       created_date_str, comment, parent=None):
+                       created_date_str, comment, command, parent=None):
   joined = Image.select().join(Repository)
   image_list = list(joined.where(Repository.name == repository_name,
                                  Repository.namespace == namespace_name,
@@ -715,6 +772,7 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name,
   fetched = image_list[0]
   fetched.created = dateutil.parser.parse(created_date_str)
   fetched.comment = comment
+  fetched.command = command
 
   if parent:
     fetched.ancestors = '%s%s/' % (parent.ancestors, parent.id)
@@ -736,6 +794,50 @@ def list_repository_tags(namespace_name, repository_name):
   return with_image.where(Repository.name == repository_name,
                           Repository.namespace == namespace_name)
 
+def delete_tag_and_images(namespace_name, repository_name, tag_name):
+  all_images = get_repository_images(namespace_name, repository_name)
+  all_tags = list_repository_tags(namespace_name, repository_name)
+
+  # Find the tag's information.
+  found_tag = None
+  for tag in all_tags:
+    if tag.name == tag_name:
+      found_tag = tag
+      break
+
+  if not found_tag:
+    return
+
+  # Build the set of database IDs corresponding to the tag's ancestor images,
+  # as well as the tag's image itself.
+  tag_image_ids = set(found_tag.image.ancestors.split('/'))
+  tag_image_ids.add(str(found_tag.image.id))
+
+  # Filter out any images that belong to any other tags.
+  for tag in all_tags:
+    if tag.name != tag_name:
+      # Remove all ancestors of the tag.
+      tag_image_ids = tag_image_ids - set(tag.image.ancestors.split('/'))
+
+      # Remove the current image ID.
+      tag_image_ids.discard(str(tag.image.id))
+
+  # Find all the images that belong to the tag.
+  tag_images = [image for image in all_images
+                if str(image.id) in tag_image_ids]
+
+  # Delete the tag found.
+  found_tag.delete_instance()
+
+  # Delete the images found.
+  for image in tag_images:
+    image.delete_instance()
+
+    repository_path = store.image_path(namespace_name, repository_name,
+                                       image.docker_image_id)
+    logger.debug('Recursively deleting image path: %s' % repository_path)
+    store.remove(repository_path)
+
 
 def get_tag_image(namespace_name, repository_name, tag_name):
   joined = Image.select().join(RepositoryTag).join(Repository)
@@ -933,6 +1035,11 @@ def purge_repository(namespace_name, repository_name):
                            Repository.namespace == namespace_name)
   fetched.delete_instance(recursive=True)
 
+  repository_path = store.repository_namespace_path(namespace_name,
+                                                    repository_name)
+  logger.debug('Recursively deleting path: %s' % repository_path)
+  store.remove(repository_path)
+
 
 def get_private_repo_count(username):
   joined = Repository.select().join(Visibility)
diff --git a/data/plans.py b/data/plans.py
index aa17ed4b7..2b8b6af2b 100644
--- a/data/plans.py
+++ b/data/plans.py
@@ -1,20 +1,13 @@
-import json
-import itertools
-
-USER_PLANS = [
-  {
-    'title': 'Open Source',
-    'price': 0,
-    'privateRepos': 0,
-    'stripeId': 'free',
-    'audience': 'Share with the world',
-  },
+PLANS = [
+  # Deprecated Plans
   {
     'title': 'Micro',
     'price': 700,
     'privateRepos': 5,
     'stripeId': 'micro',
     'audience': 'For smaller teams',
+    'bus_features': False,
+    'deprecated': True,
   },
   {
     'title': 'Basic',
@@ -22,6 +15,8 @@ USER_PLANS = [
     'privateRepos': 10,
     'stripeId': 'small',
     'audience': 'For your basic team',
+    'bus_features': False,
+    'deprecated': True,
   },
   {
     'title': 'Medium',
@@ -29,6 +24,8 @@ USER_PLANS = [
     'privateRepos': 20,
     'stripeId': 'medium',
     'audience': 'For medium teams',
+    'bus_features': False,
+    'deprecated': True,
   },
   {
     'title': 'Large',
@@ -36,16 +33,28 @@ USER_PLANS = [
     'privateRepos': 50,
     'stripeId': 'large',
     'audience': 'For larger teams',
+    'bus_features': False,
+    'deprecated': True,
   },
-]
 
-BUSINESS_PLANS = [
+  # Active plans
   {
     'title': 'Open Source',
     'price': 0,
     'privateRepos': 0,
-    'stripeId': 'bus-free',
+    'stripeId': 'free',
     'audience': 'Committment to FOSS',
+    'bus_features': False,
+    'deprecated': False,
+  },
+  {
+    'title': 'Personal',
+    'price': 1200,
+    'privateRepos': 5,
+    'stripeId': 'personal',
+    'audience': 'Individuals',
+    'bus_features': False,
+    'deprecated': False,
   },
   {
     'title': 'Skiff',
@@ -53,6 +62,8 @@ BUSINESS_PLANS = [
     'privateRepos': 10,
     'stripeId': 'bus-micro',
     'audience': 'For startups',
+    'bus_features': True,
+    'deprecated': False,
   },
   {
     'title': 'Yacht',
@@ -60,6 +71,8 @@ BUSINESS_PLANS = [
     'privateRepos': 20,
     'stripeId': 'bus-small',
     'audience': 'For small businesses',
+    'bus_features': True,
+    'deprecated': False,
   },
   {
     'title': 'Freighter',
@@ -67,6 +80,8 @@ BUSINESS_PLANS = [
     'privateRepos': 50,
     'stripeId': 'bus-medium',
     'audience': 'For normal businesses',
+    'bus_features': True,
+    'deprecated': False,
   },
   {
     'title': 'Tanker',
@@ -74,14 +89,16 @@ BUSINESS_PLANS = [
     'privateRepos': 125,
     'stripeId': 'bus-large',
     'audience': 'For large businesses',
+    'bus_features': True,
+    'deprecated': False,
   },
 ]
 
 
-def get_plan(id):
+def get_plan(plan_id):
   """ Returns the plan with the given ID or None if none. """
-  for plan in itertools.chain(USER_PLANS, BUSINESS_PLANS):
-    if plan['stripeId'] == id:
+  for plan in PLANS:
+    if plan['stripeId'] == plan_id:
       return plan
 
   return None
diff --git a/endpoints/api.py b/endpoints/api.py
index ed85e6e35..383f85ad5 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -12,7 +12,7 @@ from collections import defaultdict
 
 from data import model
 from data.queue import dockerfile_build_queue
-from data.plans import USER_PLANS, BUSINESS_PLANS, get_plan
+from data.plans import PLANS, get_plan
 from app import app
 from util.email import send_confirmation_email, send_recovery_email
 from util.names import parse_repository_name, format_robot_username
@@ -25,20 +25,53 @@ from auth.permissions import (ReadRepositoryPermission,
                               AdministerOrganizationPermission,
                               OrganizationMemberPermission,
                               ViewTeamPermission)
-from endpoints import registry
-from endpoints.web import common_login
+from endpoints.common import common_login
 from util.cache import cache_control
 from datetime import datetime, timedelta
 
+
 store = app.config['STORAGE']
 user_files = app.config['USERFILES']
 logger = logging.getLogger(__name__)
 
+route_data = None
+
+def get_route_data():
+  global route_data
+  if route_data:
+    return route_data
+
+  routes = []
+  for rule in app.url_map.iter_rules():
+    if rule.rule.startswith('/api/'):
+      endpoint_method = globals()[rule.endpoint]
+      is_internal = '__internal_call' in dir(endpoint_method)
+      is_org_api = '__user_call' in dir(endpoint_method)
+      methods = list(rule.methods.difference(['HEAD', 'OPTIONS']))
+
+      route = {
+        'name': rule.endpoint,
+        'methods': methods,
+        'path': rule.rule,
+        'parameters': list(rule.arguments)
+      }
+
+      if is_org_api:
+        route['user_method'] = endpoint_method.__user_call
+
+      routes.append(route)
+      
+  route_data = {
+    'endpoints': routes
+  }
+  return route_data
+
 
 def log_action(kind, user_or_orgname, metadata={}, repo=None):
   performer = current_user.db_user()
-  model.log_action(kind, user_or_orgname, performer=performer, ip=request.remote_addr,
-                   metadata=metadata, repository=repo)
+  model.log_action(kind, user_or_orgname, performer=performer,
+                   ip=request.remote_addr, metadata=metadata, repository=repo)
+
 
 def api_login_required(f):
   @wraps(f)
@@ -58,26 +91,51 @@ def api_login_required(f):
   return decorated_view
 
 
+def internal_api_call(f):
+  @wraps(f)
+  def decorated_view(*args, **kwargs):
+    return f(*args, **kwargs)
+
+  decorated_view.__internal_call = True
+  return decorated_view
+
+
+def org_api_call(user_call_name):
+  def internal_decorator(f):
+    @wraps(f)
+    def decorated_view(*args, **kwargs):
+      return f(*args, **kwargs)
+    
+    decorated_view.__user_call = user_call_name
+    return decorated_view
+
+  return internal_decorator
+
 @app.errorhandler(model.DataModelException)
 def handle_dme(ex):
   return make_response(ex.message, 400)
 
 
 @app.errorhandler(KeyError)
-def handle_dme(ex):
+def handle_dme_key_error(ex):
   return make_response(ex.message, 400)
 
 
+@app.route('/api/discovery')
+def discovery():
+  return jsonify(get_route_data())
+
+  
 @app.route('/api/')
+@internal_api_call
 def welcome():
   return make_response('welcome', 200)
 
 
 @app.route('/api/plans/')
-def plans_list():
+def list_plans():
   return jsonify({
-    'user': USER_PLANS,
-    'business': BUSINESS_PLANS,
+    'plans': PLANS,
   })
 
 
@@ -93,6 +151,14 @@ def user_view(user):
 
   organizations = model.get_user_organizations(user.username)
 
+  def login_view(login):
+    return {
+      'service': login.service.name,
+      'service_identifier': login.service_ident,
+    }
+
+  logins = model.list_federated_logins(user)
+
   return {
     'verified': user.verified,
     'anonymous': False,
@@ -101,12 +167,14 @@ def user_view(user):
     'gravatar': compute_hash(user.email),
     'askForPassword': user.password_hash is None,
     'organizations': [org_view(o) for o in organizations],
+    'logins': [login_view(login) for login in logins],
     'can_create_repo': True,
     'invoice_email': user.invoice_email
   }
 
 
 @app.route('/api/user/', methods=['GET'])
+@internal_api_call
 def get_logged_in_user():
   if current_user.is_anonymous():
     return jsonify({'anonymous': True})
@@ -118,8 +186,30 @@ def get_logged_in_user():
   return jsonify(user_view(user))
 
 
+@app.route('/api/user/private', methods=['GET'])
+@api_login_required
+@internal_api_call
+def get_user_private_count():
+  user = current_user.db_user()
+  private_repos = model.get_private_repo_count(user.username)
+  repos_allowed = 0
+
+  if user.stripe_id:
+    cus = stripe.Customer.retrieve(user.stripe_id)
+    if cus.subscription:
+      plan = get_plan(cus.subscription.plan.id)
+      if plan:
+        repos_allowed = plan['privateRepos']
+    
+  return jsonify({
+    'privateCount': private_repos,
+    'reposAllowed': repos_allowed
+  })
+
+
 @app.route('/api/user/convert', methods=['POST'])
 @api_login_required
+@internal_api_call
 def convert_user_to_organization():
   user = current_user.db_user()
   convert_data = request.get_json()
@@ -144,7 +234,7 @@ def convert_user_to_organization():
 
   # Subscribe the organization to the new plan.
   plan = convert_data['plan']
-  subscribe(user, plan, None, BUSINESS_PLANS)
+  subscribe(user, plan, None, True)  # Require business plans
 
   # Convert the user to an organization.
   model.convert_user_to_organization(user, model.get_user(admin_username))
@@ -152,11 +242,11 @@ def convert_user_to_organization():
 
   # And finally login with the admin credentials.
   return conduct_signin(admin_username, admin_password)
-
   
 
 @app.route('/api/user/', methods=['PUT'])
 @api_login_required
+@internal_api_call
 def change_user_details():
   user = current_user.db_user()
 
@@ -183,7 +273,8 @@ def change_user_details():
 
 
 @app.route('/api/user/', methods=['POST'])
-def create_user_api():
+@internal_api_call
+def create_new_user():
   user_data = request.get_json()
 
   existing_user = model.get_user(user_data['username'])
@@ -209,7 +300,8 @@ def create_user_api():
 
 
 @app.route('/api/signin', methods=['POST'])
-def signin_api():
+@internal_api_call
+def signin_user():
   signin_data = request.get_json()
 
   username = signin_data['username']
@@ -243,6 +335,7 @@ def conduct_signin(username, password):
 
 @app.route("/api/signout", methods=['POST'])
 @api_login_required
+@internal_api_call
 def logout():
   logout_user()
   identity_changed.send(app, identity=AnonymousIdentity())
@@ -250,7 +343,8 @@ def logout():
 
 
 @app.route("/api/recovery", methods=['POST'])
-def send_recovery():
+@internal_api_call
+def request_recovery_email():
   email = request.get_json()['email']
   code = model.create_reset_password_email_code(email)
   send_recovery_email(email, code.code)
@@ -272,9 +366,10 @@ def get_matching_users(prefix):
 def get_matching_entities(prefix):
   teams = []
 
-  namespace_name = request.args.get('namespace', None)
+  namespace_name = request.args.get('namespace', '')
   robot_namespace = None
   organization = None
+
   try:
     organization = model.get_organization(namespace_name)
 
@@ -308,7 +403,7 @@ def get_matching_entities(prefix):
       'is_robot': user.is_robot,
     }
 
-    if user.is_org_member is not None:
+    if organization is not None:
       user_json['is_org_member'] = user.is_robot or user.is_org_member
 
     return user_json
@@ -334,7 +429,8 @@ def team_view(orgname, team):
 
 @app.route('/api/organization/', methods=['POST'])
 @api_login_required
-def create_organization_api():
+@internal_api_call
+def create_organization():
   org_data = request.get_json()
   existing = None
 
@@ -398,6 +494,7 @@ def get_organization(orgname):
 
 @app.route('/api/organization/<orgname>', methods=['PUT'])
 @api_login_required
+@org_api_call('change_user_details')
 def change_organization_details(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
@@ -406,7 +503,7 @@ def change_organization_details(orgname):
     except model.InvalidOrganizationException:
       abort(404)
       
-    org_data = request.get_json();
+    org_data = request.get_json()
     if 'invoice_email' in org_data:
       logger.debug('Changing invoice_email for organization: %s', org.username)
       model.change_invoice_email(org, org_data['invoice_email'])
@@ -456,7 +553,7 @@ def get_organization_member(orgname, membername):
       abort(404)
       
     member_dict = None
-    member_teams = model.get_organization_members_with_teams(org, membername = membername)
+    member_teams = model.get_organization_members_with_teams(org, membername=membername)
     for member in member_teams:
       if not member_dict:
         member_dict = {'username': member.user.username,
@@ -475,6 +572,7 @@ def get_organization_member(orgname, membername):
 
 @app.route('/api/organization/<orgname>/private', methods=['GET'])
 @api_login_required
+@internal_api_call
 def get_organization_private_allowed(orgname):
   permission = CreateRepositoryPermission(orgname)
   if permission.can():
@@ -484,7 +582,11 @@ def get_organization_private_allowed(orgname):
     if organization.stripe_id:
       cus = stripe.Customer.retrieve(organization.stripe_id)
       if cus.subscription:
-        repos_allowed = get_plan(cus.subscription.plan.id)
+        repos_allowed = 0
+        plan = get_plan(cus.subscription.plan.id)
+        if plan:
+          repos_allowed = plan['privateRepos']
+              
         return jsonify({
           'privateAllowed': (private_repos < repos_allowed)
         })
@@ -526,17 +628,20 @@ def update_organization_team(orgname, teamname):
       log_action('org_create_team', orgname, {'team': teamname})
 
     if is_existing:
-      if 'description' in details and team.description != details['description']:
+      if ('description' in details and
+          team.description != details['description']):
         team.description = details['description']
         team.save()
-        log_action('org_set_team_description', orgname, {'team': teamname, 'description': team.description})
+        log_action('org_set_team_description', orgname,
+                   {'team': teamname, 'description': team.description})
 
       if 'role' in details:
         role = model.get_team_org_role(team).name
         if role != details['role']:
           team = model.set_team_org_permission(team, details['role'],
                                                current_user.db_user().username)
-          log_action('org_set_team_role', orgname, {'team': teamname, 'role': details['role']})
+          log_action('org_set_team_role', orgname,
+                     {'team': teamname, 'role': details['role']})
           
     resp = jsonify(team_view(orgname, team))
     if not is_existing:
@@ -604,7 +709,8 @@ def update_organization_team_member(orgname, teamname, membername):
       
     # Add the user to the team.
     model.add_user_to_team(user, team)
-    log_action('org_add_team_member', orgname, {'member': membername, 'team': teamname})
+    log_action('org_add_team_member', orgname,
+               {'member': membername, 'team': teamname})
     return jsonify(member_view(user))
 
   abort(403)
@@ -619,7 +725,8 @@ def delete_organization_team_member(orgname, teamname, membername):
     # Remote the user from the team.
     invoking_user = current_user.db_user().username
     model.remove_user_from_team(orgname, teamname, membername, invoking_user)
-    log_action('org_remove_team_member', orgname, {'member': membername, 'team': teamname})
+    log_action('org_remove_team_member', orgname,
+               {'member': membername, 'team': teamname})
     return make_response('Deleted', 204)
 
   abort(403)
@@ -627,7 +734,7 @@ def delete_organization_team_member(orgname, teamname, membername):
 
 @app.route('/api/repository', methods=['POST'])
 @api_login_required
-def create_repo_api():
+def create_repo():
   owner = current_user.db_user()
   req = request.get_json()
   namespace_name = req['namespace'] if 'namespace' in req else owner.username
@@ -648,7 +755,9 @@ def create_repo_api():
     repo.description = req['description']
     repo.save()
 
-    log_action('create_repo', namespace_name, {'repo': repository_name, 'namespace': namespace_name}, repo=repo)
+    log_action('create_repo', namespace_name,
+               {'repo': repository_name, 'namespace': namespace_name},
+               repo=repo)
     return jsonify({
       'namespace': namespace_name,
       'name': repository_name
@@ -658,7 +767,7 @@ def create_repo_api():
 
 
 @app.route('/api/find/repository', methods=['GET'])
-def match_repos_api():
+def find_repos():
   prefix = request.args.get('query', '')
 
   def repo_view(repo):
@@ -681,7 +790,7 @@ def match_repos_api():
 
 
 @app.route('/api/repository/', methods=['GET'])
-def list_repos_api():
+def list_repos():
   def repo_view(repo_obj):
     return {
       'namespace': repo_obj.namespace,
@@ -690,11 +799,13 @@ def list_repos_api():
       'is_public': repo_obj.visibility.name == 'public',
     }
 
+  page = request.args.get('page', None)
   limit = request.args.get('limit', None)
   namespace_filter = request.args.get('namespace', None)
   include_public = request.args.get('public', 'true')
   include_private = request.args.get('private', 'true')
   sort = request.args.get('sort', 'false')
+  include_count = request.args.get('count', 'false')
 
   try:
     limit = int(limit) if limit else None
@@ -703,28 +814,45 @@ def list_repos_api():
 
   include_public = include_public == 'true'
   include_private = include_private == 'true'
+  include_count = include_count == 'true'
   sort = sort == 'true'
+  if page:
+    try:
+      page = int(page)
+    except:
+      page = None
 
   username = None
   if current_user.is_authenticated() and include_private:
     username = current_user.db_user().username
 
-  repo_query = model.get_visible_repositories(username, limit=limit,
+  repo_count = None
+  if include_count:
+    repo_count = model.get_visible_repository_count(username,
+                                                    include_public=include_public,
+                                                    sort=sort,
+                                                    namespace=namespace_filter)
+
+  repo_query = model.get_visible_repositories(username, limit=limit, page=page,
                                               include_public=include_public,
                                               sort=sort,
                                               namespace=namespace_filter)
+
   repos = [repo_view(repo) for repo in repo_query]
   response = {
     'repositories': repos
   }
 
+  if include_count:
+    response['count'] = repo_count
+
   return jsonify(response)
 
 
 @app.route('/api/repository/<path:repository>', methods=['PUT'])
 @api_login_required
 @parse_repository_name
-def update_repo_api(namespace, repository):
+def update_repo(namespace, repository):
   permission = ModifyRepositoryPermission(namespace, repository)
   if permission.can():
     repo = model.get_repository(namespace, repository)
@@ -733,7 +861,8 @@ def update_repo_api(namespace, repository):
       repo.description = values['description']
       repo.save()
       
-      log_action('set_repo_description', namespace, {'repo': repository, 'description': values['description']},
+      log_action('set_repo_description', namespace,
+                 {'repo': repository, 'description': values['description']},
                  repo=repo)
       return jsonify({
           'success': True
@@ -746,14 +875,15 @@ def update_repo_api(namespace, repository):
            methods=['POST'])
 @api_login_required
 @parse_repository_name
-def change_repo_visibility_api(namespace, repository):
+def change_repo_visibility(namespace, repository):
   permission = AdministerRepositoryPermission(namespace, repository)
   if permission.can():
     repo = model.get_repository(namespace, repository)
     if repo:
       values = request.get_json()
       model.set_repository_visibility(repo, values['visibility'])
-      log_action('change_repo_visibility', namespace, {'repo': repository, 'visibility': values['visibility']},
+      log_action('change_repo_visibility', namespace,
+                 {'repo': repository, 'visibility': values['visibility']},
                  repo=repo)
       return jsonify({
           'success': True
@@ -769,8 +899,8 @@ def delete_repository(namespace, repository):
   permission = AdministerRepositoryPermission(namespace, repository)
   if permission.can():
     model.purge_repository(namespace, repository)
-    registry.delete_repository_storage(namespace, repository)
-    log_action('delete_repo', namespace, {'repo': repository, 'namespace': namespace})
+    log_action('delete_repo', namespace,
+               {'repo': repository, 'namespace': namespace})
     return make_response('Deleted', 204)
 
   abort(403)
@@ -781,14 +911,16 @@ def image_view(image):
     'id': image.docker_image_id,
     'created': image.created,
     'comment': image.comment,
+    'command': json.loads(image.command) if image.command else None,
     'ancestors': image.ancestors,
     'dbid': image.id,
+    'size': image.image_size,
   }
 
 
 @app.route('/api/repository/<path:repository>', methods=['GET'])
 @parse_repository_name
-def get_repo_api(namespace, repository):
+def get_repo(namespace, repository):
   logger.debug('Get repo: %s/%s' % (namespace, repository))
 
   def tag_view(tag):
@@ -849,15 +981,15 @@ def get_repo_builds(namespace, repository):
         return node_status
 
       # If there was no status url, do the best we can
+      # The format of this block should mirror that of the buildserver.
       return {
         'id': build_obj.id,
         'total_commands': None,
-        'total_images': None,
         'current_command': None,
-        'current_image': None,
-        'image_completion_percent': None,
+        'push_completion': 0.0,
         'status': build_obj.phase,
         'message': None,
+        'image_completion': {},
       }
 
     builds = model.list_repository_builds(namespace, repository)
@@ -887,7 +1019,8 @@ def request_repo_build(namespace, repository):
     dockerfile_build_queue.put(json.dumps({'build_id': build_request.id}))
 
     log_action('build_dockerfile', namespace,
-               {'repo': repository, 'namespace': namespace, 'fileid': dockerfile_id}, repo=repo)
+               {'repo': repository, 'namespace': namespace,
+                'fileid': dockerfile_id}, repo=repo)
 
     resp = jsonify({
       'started': True
@@ -918,7 +1051,8 @@ def create_webhook(namespace, repository):
     resp.headers['Location'] = url_for('get_webhook', repository=repo_string,
                                        public_id=webhook.public_id)
     log_action('add_repo_webhook', namespace, 
-               {'repo': repository, 'webhook_id': webhook.public_id}, repo=repo)
+               {'repo': repository, 'webhook_id': webhook.public_id},
+               repo=repo)
     return resp
 
   abort(403)  # Permissions denied
@@ -969,6 +1103,7 @@ def delete_webhook(namespace, repository, public_id):
 
 @app.route('/api/filedrop/', methods=['POST'])
 @api_login_required
+@internal_api_call
 def get_filedrop_url():
   mime_type = request.get_json()['mimeType']
   (url, file_id) = user_files.prepare_for_drop(mime_type)
@@ -1051,6 +1186,24 @@ def get_image_changes(namespace, repository, image_id):
   abort(403)
 
 
+@app.route('/api/repository/<path:repository>/tag/<tag>',
+           methods=['DELETE'])
+@parse_repository_name
+def delete_full_tag(namespace, repository, tag):
+  permission = AdministerRepositoryPermission(namespace, repository)
+  if permission.can():
+    model.delete_tag_and_images(namespace, repository, tag)
+
+    username = current_user.db_user().username
+    log_action('delete_tag', namespace,
+               {'username': username, 'repo': repository, 'tag': tag},
+               repo=model.get_repository(namespace, repository))
+
+    return make_response('Deleted', 204)
+
+  abort(403)  # Permission denied
+
+
 @app.route('/api/repository/<path:repository>/tag/<tag>/images',
            methods=['GET'])
 @parse_repository_name
@@ -1118,7 +1271,8 @@ def list_repo_user_permissions(namespace, repository):
       current_func = role_view_func
 
       def wrapped_role_org_view(repo_perm):
-        return wrap_role_view_org(current_func(repo_perm), repo_perm.user, org_members)
+        return wrap_role_view_org(current_func(repo_perm), repo_perm.user,
+                                  org_members)
 
       role_view_func = wrapped_role_org_view
     
@@ -1203,7 +1357,8 @@ def change_user_permissions(namespace, repository, username):
       return error_resp
       
     log_action('change_repo_permission', namespace,
-               {'username': username, 'repo': repository, 'role': new_permission['role']},
+               {'username': username, 'repo': repository,
+                'role': new_permission['role']},
                repo=model.get_repository(namespace, repository))
 
     resp = jsonify(perm_view)
@@ -1230,7 +1385,8 @@ def change_team_permissions(namespace, repository, teamname):
                                           new_permission['role'])
 
     log_action('change_repo_permission', namespace,
-               {'team': teamname, 'repo': repository, 'role': new_permission['role']},
+               {'team': teamname, 'repo': repository,
+                'role': new_permission['role']},
                repo=model.get_repository(namespace, repository))
 
     resp = jsonify(role_view(perm))
@@ -1257,7 +1413,8 @@ def delete_user_permissions(namespace, repository, username):
       error_resp.status_code = 400
       return error_resp
 
-    log_action('delete_repo_permission', namespace, {'username': username, 'repo': repository},
+    log_action('delete_repo_permission', namespace,
+               {'username': username, 'repo': repository},
                repo=model.get_repository(namespace, repository))
     
     return make_response('Deleted', 204)
@@ -1274,7 +1431,8 @@ def delete_team_permissions(namespace, repository, teamname):
   if permission.can():
     model.delete_team_permission(teamname, namespace, repository)
 
-    log_action('delete_repo_permission', namespace, {'team': teamname, 'repo': repository},
+    log_action('delete_repo_permission', namespace,
+               {'team': teamname, 'repo': repository},
                repo=model.get_repository(namespace, repository))
 
     return make_response('Deleted', 204)
@@ -1328,7 +1486,8 @@ def create_token(namespace, repository):
     token = model.create_delegate_token(namespace, repository,
                                         token_params['friendlyName'])
 
-    log_action('add_repo_accesstoken', namespace, {'repo': repository, 'token': token_params['friendlyName']},
+    log_action('add_repo_accesstoken', namespace,
+               {'repo': repository, 'token': token_params['friendlyName']},
                repo = model.get_repository(namespace, repository))
 
     resp = jsonify(token_view(token))
@@ -1353,7 +1512,8 @@ def change_token(namespace, repository, code):
                                                new_permission['role'])
 
     log_action('change_repo_permission', namespace,
-               {'repo': repository, 'token': token.friendly_name, 'code': code, 'role': new_permission['role']},
+               {'repo': repository, 'token': token.friendly_name, 'code': code,
+                'role': new_permission['role']},
                repo = model.get_repository(namespace, repository))
 
     resp = jsonify(token_view(token))
@@ -1372,7 +1532,8 @@ def delete_token(namespace, repository, code):
     token = model.delete_delegate_token(namespace, repository, code)
 
     log_action('delete_repo_accesstoken', namespace,
-               {'repo': repository, 'token': token.friendly_name, 'code': code},
+               {'repo': repository, 'token': token.friendly_name,
+                'code': code},
                repo = model.get_repository(namespace, repository))
 
     return make_response('Deleted', 204)
@@ -1391,14 +1552,17 @@ def subscription_view(stripe_subscription, used_repos):
 
 @app.route('/api/user/card', methods=['GET'])
 @api_login_required
-def get_user_card_api():
+@internal_api_call
+def get_user_card():
   user = current_user.db_user()
   return get_card(user)
 
 
 @app.route('/api/organization/<orgname>/card', methods=['GET'])
 @api_login_required
-def get_org_card_api(orgname):
+@internal_api_call
+@org_api_call('get_user_card')
+def get_org_card(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
     organization = model.get_organization(orgname)
@@ -1409,7 +1573,8 @@ def get_org_card_api(orgname):
 
 @app.route('/api/user/card', methods=['POST'])
 @api_login_required
-def set_user_card_api():
+@internal_api_call
+def set_user_card():
   user = current_user.db_user()
   token = request.get_json()['token']
   response = set_card(user, token)
@@ -1419,7 +1584,8 @@ def set_user_card_api():
 
 @app.route('/api/organization/<orgname>/card', methods=['POST'])
 @api_login_required
-def set_org_card_api(orgname):
+@org_api_call('set_user_card')
+def set_org_card(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
     organization = model.get_organization(orgname)
@@ -1461,21 +1627,22 @@ def get_card(user):
 
       if default_card:
         card_info = {
-          'owner': card.name,
-          'type': card.type,
-          'last4': card.last4
+          'owner': default_card.name,
+          'type': default_card.type,
+          'last4': default_card.last4
         }
 
   return jsonify({'card': card_info})
 
 @app.route('/api/user/plan', methods=['PUT'])
 @api_login_required
-def subscribe_api():
+@internal_api_call
+def update_user_subscription():
   request_data = request.get_json()
   plan = request_data['plan']
   token = request_data['token'] if 'token' in request_data else None
   user = current_user.db_user()
-  return subscribe(user, plan, token, USER_PLANS)
+  return subscribe(user, plan, token, False)  # Business features not required
 
 
 def carderror_response(e):
@@ -1486,15 +1653,22 @@ def carderror_response(e):
   return resp
 
 
-def subscribe(user, plan, token, accepted_plans):
+def subscribe(user, plan, token, require_business_plan):
   plan_found = None
-  for plan_obj in accepted_plans:
+  for plan_obj in PLANS:
     if plan_obj['stripeId'] == plan:
       plan_found = plan_obj
 
-  if not plan_found:
+  if not plan_found or plan_found['deprecated']:
+    logger.warning('Plan not found or deprecated: %s', plan)
     abort(404)
 
+  if (require_business_plan and not plan_found['bus_features'] and not
+                                  plan_found['price'] == 0):
+    logger.warning('Business attempting to subscribe to personal plan: %s',
+                   user.username)
+    abort(400)
+
   private_repos = model.get_private_repo_count(user.username)
 
   # This is the default response
@@ -1553,9 +1727,32 @@ def subscribe(user, plan, token, accepted_plans):
   return resp
 
 
+@app.route('/api/user/invoices', methods=['GET'])
+@api_login_required
+def list_user_invoices():
+  user = current_user.db_user()
+  if not user.stripe_id:
+    abort(404)
+      
+  return get_invoices(user.stripe_id)
+
+
 @app.route('/api/organization/<orgname>/invoices', methods=['GET'])
 @api_login_required
-def org_invoices_api(orgname):
+@org_api_call('list_user_invoices')
+def list_org_invoices(orgname):
+  permission = AdministerOrganizationPermission(orgname)
+  if permission.can():
+    organization = model.get_organization(orgname)
+    if not organization.stripe_id:
+      abort(404)
+      
+    return get_invoices(organization.stripe_id)
+
+  abort(403)
+
+
+def get_invoices(customer_id):
   def invoice_view(i):
     return {
       'id': i.id,
@@ -1571,37 +1768,32 @@ def org_invoices_api(orgname):
       'plan': i.lines.data[0].plan.id if i.lines.data[0].plan else None
     }
     
-  permission = AdministerOrganizationPermission(orgname)
-  if permission.can():
-    organization = model.get_organization(orgname)
-    if not organization.stripe_id:
-      abort(404)
-      
-    invoices = stripe.Invoice.all(customer=organization.stripe_id, count=12)
-    return jsonify({
-      'invoices': [invoice_view(i) for i in invoices.data]
-    })
-
-  abort(403)  
+  invoices = stripe.Invoice.all(customer=customer_id, count=12)
+  return jsonify({
+    'invoices': [invoice_view(i) for i in invoices.data]
+  })
 
 
 @app.route('/api/organization/<orgname>/plan', methods=['PUT'])
 @api_login_required
-def subscribe_org_api(orgname):
+@internal_api_call
+@org_api_call('update_user_subscription')
+def update_org_subscription(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
     request_data = request.get_json()
     plan = request_data['plan']
     token = request_data['token'] if 'token' in request_data else None
     organization = model.get_organization(orgname)
-    return subscribe(organization, plan, token, BUSINESS_PLANS)
+    return subscribe(organization, plan, token, True)  # Business plan required
 
   abort(403)
   
 
 @app.route('/api/user/plan', methods=['GET'])
 @api_login_required
-def get_subscription():
+@internal_api_call
+def get_user_subscription():
   user = current_user.db_user()
   private_repos = model.get_private_repo_count(user.username)
 
@@ -1619,6 +1811,8 @@ def get_subscription():
 
 @app.route('/api/organization/<orgname>/plan', methods=['GET'])
 @api_login_required
+@internal_api_call
+@org_api_call('get_user_subscription')
 def get_org_subscription(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
@@ -1631,7 +1825,7 @@ def get_org_subscription(orgname):
         return jsonify(subscription_view(cus.subscription, private_repos))
 
     return jsonify({
-      'plan': 'bus-free',
+      'plan': 'free',
       'usedPrivateRepos': private_repos,
     })
 
@@ -1657,6 +1851,7 @@ def get_user_robots():
 
 @app.route('/api/organization/<orgname>/robots', methods=['GET'])
 @api_login_required
+@org_api_call('get_user_robots')
 def get_org_robots(orgname):
   permission = OrganizationMemberPermission(orgname)
   if permission.can():
@@ -1670,7 +1865,7 @@ def get_org_robots(orgname):
 
 @app.route('/api/user/robots/<robot_shortname>', methods=['PUT'])
 @api_login_required
-def create_robot(robot_shortname):
+def create_user_robot(robot_shortname):
   parent = current_user.db_user()
   robot, password = model.create_robot(robot_shortname, parent)
   resp = jsonify(robot_view(robot.username, password))
@@ -1682,6 +1877,7 @@ def create_robot(robot_shortname):
 @app.route('/api/organization/<orgname>/robots/<robot_shortname>',
            methods=['PUT'])
 @api_login_required
+@org_api_call('create_user_robot')
 def create_org_robot(orgname, robot_shortname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
@@ -1697,7 +1893,7 @@ def create_org_robot(orgname, robot_shortname):
 
 @app.route('/api/user/robots/<robot_shortname>', methods=['DELETE'])
 @api_login_required
-def delete_robot(robot_shortname):
+def delete_user_robot(robot_shortname):
   parent = current_user.db_user()
   model.delete_robot(format_robot_username(parent.username, robot_shortname))
   log_action('delete_robot', parent.username, {'robot': robot_shortname})
@@ -1707,6 +1903,7 @@ def delete_robot(robot_shortname):
 @app.route('/api/organization/<orgname>/robots/<robot_shortname>',
            methods=['DELETE'])
 @api_login_required
+@org_api_call('delete_user_robot')
 def delete_org_robot(orgname, robot_shortname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
@@ -1718,27 +1915,27 @@ def delete_org_robot(orgname, robot_shortname):
 
 
 def log_view(log):
-    view = {
-      'kind': log.kind.name,
-      'metadata': json.loads(log.metadata_json),
-      'ip': log.ip,      
-      'datetime': log.datetime,
+  view = {
+    'kind': log.kind.name,
+    'metadata': json.loads(log.metadata_json),
+    'ip': log.ip,      
+    'datetime': log.datetime,
+  }
+
+  if log.performer:
+    view['performer'] = {
+      'username': log.performer.username,
+      'is_robot': log.performer.robot,
     }
 
-    if log.performer:
-      view['performer'] = {
-        'username': log.performer.username,
-        'is_robot': log.performer.robot,
-      }
-
-    return view
+  return view
 
 
 
 @app.route('/api/repository/<path:repository>/logs', methods=['GET'])
 @api_login_required
 @parse_repository_name
-def repo_logs_api(namespace, repository):
+def list_repo_logs(namespace, repository):
   permission = AdministerRepositoryPermission(namespace, repository)
   if permission.can():
     repo = model.get_repository(namespace, repository)
@@ -1754,19 +1951,33 @@ def repo_logs_api(namespace, repository):
 
 @app.route('/api/organization/<orgname>/logs', methods=['GET'])
 @api_login_required
-def org_logs_api(orgname):
+@org_api_call('list_user_logs')
+def list_org_logs(orgname):
   permission = AdministerOrganizationPermission(orgname)
   if permission.can():
     performer_name = request.args.get('performer', None)
     start_time = request.args.get('starttime', None)
     end_time = request.args.get('endtime', None)
 
-    return get_logs(orgname, start_time, end_time, performer_name=performer_name)
+    return get_logs(orgname, start_time, end_time,
+                    performer_name=performer_name)
 
   abort(403)
 
 
-def get_logs(namespace, start_time, end_time, performer_name=None, repository=None):
+@app.route('/api/user/logs', methods=['GET'])
+@api_login_required
+def list_user_logs():
+  performer_name = request.args.get('performer', None)
+  start_time = request.args.get('starttime', None)
+  end_time = request.args.get('endtime', None)
+
+  return get_logs(current_user.db_user().username, start_time, end_time,
+                  performer_name=performer_name)
+
+
+def get_logs(namespace, start_time, end_time, performer_name=None,
+             repository=None):
   performer = None
   if performer_name:
     performer = model.get_user(performer_name)
@@ -1790,7 +2001,8 @@ def get_logs(namespace, start_time, end_time, performer_name=None, repository=No
   if not end_time:  
     end_time = datetime.today()
 
-  logs = model.list_logs(namespace, start_time, end_time, performer = performer, repository=repository)
+  logs = model.list_logs(namespace, start_time, end_time, performer=performer,
+                         repository=repository)
   return jsonify({
     'start_time': start_time,
     'end_time': end_time,
diff --git a/endpoints/common.py b/endpoints/common.py
new file mode 100644
index 000000000..d6bd0125a
--- /dev/null
+++ b/endpoints/common.py
@@ -0,0 +1,48 @@
+import logging
+
+from flask.ext.login import login_user, UserMixin
+from flask.ext.principal import identity_changed
+
+from data import model
+from app import app, login_manager
+from auth.permissions import QuayDeferredPermissionUser
+
+
+logger = logging.getLogger(__name__)
+
+
+@login_manager.user_loader
+def load_user(username):
+  logger.debug('Loading user: %s' % username)
+  return _LoginWrappedDBUser(username)
+
+class _LoginWrappedDBUser(UserMixin):
+  def __init__(self, db_username, db_user=None):
+
+    self._db_username = db_username
+    self._db_user = db_user
+
+  def db_user(self):
+    if not self._db_user:
+      self._db_user = model.get_user(self._db_username)
+    return self._db_user
+
+  def is_authenticated(self):
+    return self.db_user() is not None
+
+  def is_active(self):
+    return self.db_user().verified
+
+  def get_id(self):
+    return unicode(self._db_username)
+
+
+def common_login(db_user):
+  if login_user(_LoginWrappedDBUser(db_user.username, db_user)):
+    logger.debug('Successfully signed in as: %s' % db_user.username)
+    new_identity = QuayDeferredPermissionUser(db_user.username, 'username')
+    identity_changed.send(app, identity=new_identity)
+    return True
+  else:
+    logger.debug('User could not be logged in, inactive?.')
+    return False
diff --git a/endpoints/index.py b/endpoints/index.py
index 8ddf64b91..f07405092 100644
--- a/endpoints/index.py
+++ b/endpoints/index.py
@@ -63,14 +63,14 @@ def create_user():
       model.load_token_data(password)
       return make_response('Verified', 201)
     except model.InvalidTokenException:
-      abort(401)
+      return make_response('Invalid access token.', 400)
 
   elif '+' in username:
     try:
       model.verify_robot(username, password)
       return make_response('Verified', 201)
     except model.InvalidRobotException:
-      abort(401)
+      return make_response('Invalid robot account or password.', 400)
 
   existing_user = model.get_user(username)
   if existing_user:
@@ -78,7 +78,7 @@ def create_user():
     if verified:
       return make_response('Verified', 201)
     else:
-      abort(401)
+      return make_response('Invalid password.', 400)
   else:
     # New user case
     new_user = model.create_user(username, password, user_data['email'])
@@ -134,8 +134,8 @@ def create_repository(namespace, repository):
   repo = model.get_repository(namespace, repository)
 
   if not repo and get_authenticated_user() is None:
-    logger.debug('Attempt to create new repository with token auth.')
-    abort(400)
+    logger.debug('Attempt to create new repository without user auth.')
+    abort(401)
 
   elif repo:
     permission = ModifyRepositoryPermission(namespace, repository)
@@ -158,10 +158,6 @@ def create_repository(namespace, repository):
   for existing in model.get_repository_images(namespace, repository):
     if existing.docker_image_id in new_repo_images:
       added_images.pop(existing.docker_image_id)
-    else:
-      logger.debug('Deleting existing image with id: %s' %
-                   existing.docker_image_id)
-      existing.delete_instance(recursive=True)
 
   for image_description in added_images.values():
     model.create_image(image_description['id'], repo)
diff --git a/endpoints/registry.py b/endpoints/registry.py
index e6b34493e..f1b6ae223 100644
--- a/endpoints/registry.py
+++ b/endpoints/registry.py
@@ -43,6 +43,7 @@ def require_completion(f):
   def wrapper(namespace, repository, *args, **kwargs):
     if store.exists(store.image_mark_path(namespace, repository,
                                           kwargs['image_id'])):
+      logger.warning('Image is already being uploaded: %s', kwargs['image_id'])
       abort(400)  # 'Image is being uploaded, retry later')
     return f(namespace, repository, *args, **kwargs)
   return wrapper
@@ -87,6 +88,7 @@ def get_image_layer(namespace, repository, image_id, headers):
     try:
       return Response(store.stream_read(path), headers=headers)
     except IOError:
+      logger.warning('Image not found: %s', image_id)
       abort(404)  # 'Image not found', 404)
 
   abort(403)
@@ -124,6 +126,11 @@ def put_image_layer(namespace, repository, image_id):
   store.stream_write(layer_path, sr)
   csums.append('sha256:{0}'.format(h.hexdigest()))
   try:
+    image_size = tmp.tell()
+
+    # Save the size of the image.
+    model.set_image_size(image_id, namespace, repository, image_size)
+
     tmp.seek(0)
     csums.append(checksums.compute_tarsum(tmp, json_data))
     tmp.close()
@@ -141,7 +148,7 @@ def put_image_layer(namespace, repository, image_id):
     return make_response('true', 200)
   # We check if the checksums provided matches one the one we computed
   if checksum not in csums:
-    logger.debug('put_image_layer: Wrong checksum')
+    logger.warning('put_image_layer: Wrong checksum')
     abort(400)  # 'Checksum mismatch, ignoring the layer')
   # Checksum is ok, we remove the marker
   store.remove(mark_path)
@@ -168,8 +175,10 @@ def put_image_checksum(namespace, repository, image_id):
 
   checksum = request.headers.get('X-Docker-Checksum')
   if not checksum:
+    logger.warning('Missing Image\'s checksum: %s', image_id)
     abort(400)  # 'Missing Image\'s checksum')
   if not session.get('checksum'):
+    logger.warning('Checksum not found in Cookie for image: %s', image_id)
     abort(400)  # 'Checksum not found in Cookie')
   if not store.exists(store.image_json_path(namespace, repository, image_id)):
     abort(404)  # 'Image not found', 404)
@@ -287,8 +296,11 @@ def put_image_json(namespace, repository, image_id):
   except json.JSONDecodeError:
     pass
   if not data or not isinstance(data, dict):
+    logger.warning('Invalid JSON for image: %s json: %s', image_id,
+                   request.data)
     abort(400)  # 'Invalid JSON')
   if 'id' not in data:
+    logger.warning('Missing key `id\' in JSON for image: %s', image_id)
     abort(400)  # 'Missing key `id\' in JSON')
   # Read the checksum
   checksum = request.headers.get('X-Docker-Checksum')
@@ -301,11 +313,14 @@ def put_image_json(namespace, repository, image_id):
     # We cleanup any old checksum in case it's a retry after a fail
     store.remove(store.image_checksum_path(namespace, repository, image_id))
   if image_id != data['id']:
+    logger.warning('JSON data contains invalid id for image: %s', image_id)
     abort(400)  # 'JSON data contains invalid id')
   parent_id = data.get('parent')
   if parent_id and not store.exists(store.image_json_path(namespace,
                                                           repository,
                                                           data['parent'])):
+    logger.warning('Image depends on a non existing parent image: %s',
+                   image_id)
     abort(400)  # 'Image depends on a non existing parent')
   json_path = store.image_json_path(namespace, repository, image_id)
   mark_path = store.image_mark_path(namespace, repository, image_id)
@@ -319,8 +334,10 @@ def put_image_json(namespace, repository, image_id):
   else:
     parent_obj = None
 
+  command_list = data.get('container_config', {}).get('Cmd', None)
+  command = json.dumps(command_list) if command_list else None
   model.set_image_metadata(image_id, namespace, repository,
-                           data.get('created'), data.get('comment'),
+                           data.get('created'), data.get('comment'), command,
                            parent_obj)
   store.put_content(mark_path, 'true')
   store.put_content(json_path, request.data)
@@ -328,14 +345,6 @@ def put_image_json(namespace, repository, image_id):
   return make_response('true', 200)
 
 
-def delete_repository_storage(namespace, repository):
-  """ Caller should have already verified proper permissions. """
-  repository_path = store.repository_namespace_path(namespace, repository)
-
-  logger.debug('Recursively deleting path: %s' % repository_path)
-  store.remove(repository_path)
-
-
 def process_image_changes(namespace, repository, image_id):
   logger.debug('Generating diffs for image: %s' % image_id)
 
diff --git a/endpoints/test.py b/endpoints/test.py
index ff5e42c37..bbd9e286a 100644
--- a/endpoints/test.py
+++ b/endpoints/test.py
@@ -1,19 +1,33 @@
+import math
+
 from random import SystemRandom
-from flask import jsonify, send_file
+from flask import jsonify
 from app import app
 
 
+def generate_image_completion(rand_func):
+  images = {}
+  for image_id in range(rand_func.randint(1, 11)):
+    total = int(math.pow(abs(rand_func.gauss(0, 1000)), 2))
+    current = rand_func.randint(0, total)
+    image_id = 'image_id_%s' % image_id
+    images[image_id] = {
+      'total': total,
+      'current': current,
+    }
+  return images
+
+
 @app.route('/test/build/status', methods=['GET'])
 def generate_random_build_status():
   response = {
     'id': 1,
     'total_commands': None,
-    'total_images': None,
     'current_command': None,
-    'current_image': None,
-    'image_completion_percent': None,
+    'push_completion': 0.0,
     'status': None,
     'message': None,
+    'image_completion': {},
   }
 
   random = SystemRandom()
@@ -35,9 +49,8 @@ def generate_random_build_status():
     'pushing': {
       'total_commands': 7,
       'current_command': 7,
-      'total_images': 11,
-      'current_image': random.randint(1, 11),
-      'image_completion_percent': random.randint(0, 100),
+      'push_completion': random.random(),
+      'image_completion': generate_image_completion(random),
     },
   }
 
diff --git a/endpoints/web.py b/endpoints/web.py
index 5b09bde22..d4a7d7651 100644
--- a/endpoints/web.py
+++ b/endpoints/web.py
@@ -4,53 +4,33 @@ import stripe
 
 from flask import (abort, redirect, request, url_for, render_template,
                    make_response, Response)
-from flask.ext.login import login_user, UserMixin
-from flask.ext.principal import identity_changed
+from flask.ext.login import login_required, current_user
 from urlparse import urlparse
 
 from data import model
-from app import app, login_manager, mixpanel
-from auth.permissions import (QuayDeferredPermissionUser,
-                              AdministerOrganizationPermission)
+from app import app, mixpanel
+from auth.permissions import AdministerOrganizationPermission
 from util.invoice import renderInvoiceToPdf
 from util.seo import render_snapshot
+from util.cache import no_cache
+from endpoints.api import get_route_data
+from endpoints.common import common_login
 
 
 logger = logging.getLogger(__name__)
 
 
-class _LoginWrappedDBUser(UserMixin):
-  def __init__(self, db_username, db_user=None):
-
-    self._db_username = db_username
-    self._db_user = db_user
-
-  def db_user(self):
-    if not self._db_user:
-      self._db_user = model.get_user(self._db_username)
-    return self._db_user
-
-  def is_authenticated(self):
-    return self.db_user() is not None
-
-  def is_active(self):
-    return self.db_user().verified
-
-  def get_id(self):
-    return unicode(self._db_username)
-
-
-@login_manager.user_loader
-def load_user(username):
-  logger.debug('Loading user: %s' % username)
-  return _LoginWrappedDBUser(username)
+def render_page_template(name, **kwargs):
+  return make_response(render_template(name, route_data=get_route_data(),
+                                       **kwargs))
 
 
 @app.route('/', methods=['GET'], defaults={'path': ''})
 @app.route('/repository/<path:path>', methods=['GET'])
 @app.route('/organization/<path:path>', methods=['GET'])
+@no_cache
 def index(path):
-  return render_template('index.html')
+  return render_page_template('index.html')
 
 
 @app.route('/snapshot', methods=['GET'])
@@ -67,26 +47,32 @@ def snapshot(path = ''):
 
 
 @app.route('/plans/')
+@no_cache
 def plans():
   return index('')
 
 
 @app.route('/guide/')
+@no_cache
 def guide():
   return index('')
 
 
 @app.route('/organizations/')
 @app.route('/organizations/new/')
+@no_cache
 def organizations():
   return index('')
 
+
 @app.route('/user/')
+@no_cache
 def user():
   return index('')
 
 
 @app.route('/signin/')
+@no_cache
 def signin():
   return index('')
 
@@ -97,76 +83,85 @@ def contact():
 
 
 @app.route('/new/')
+@no_cache
 def new():
   return index('')
 
 
 @app.route('/repository/')
+@no_cache
 def repository():
   return index('')
 
 
 @app.route('/security/')
+@no_cache
 def security():
   return index('')
 
 
 @app.route('/v1')
 @app.route('/v1/')
+@no_cache
 def v1():
   return index('')
 
 
 @app.route('/status', methods=['GET'])
+@no_cache
 def status():
   return make_response('Healthy')
 
 
 @app.route('/tos', methods=['GET'])
+@no_cache
 def tos():
-  return render_template('tos.html')
+  return render_page_template('tos.html')
 
 
 @app.route('/disclaimer', methods=['GET'])
+@no_cache
 def disclaimer():
-  return render_template('disclaimer.html')
+  return render_page_template('disclaimer.html')
 
 
 @app.route('/privacy', methods=['GET'])
+@no_cache
 def privacy():
-  return render_template('privacy.html')
+  return render_page_template('privacy.html')
 
 
 @app.route('/receipt', methods=['GET'])
 def receipt():
+  if not current_user.is_authenticated():
+    abort(401)
+    return
+
   id =  request.args.get('id')
   if id:
     invoice = stripe.Invoice.retrieve(id)
     if invoice:
-      org = model.get_user_or_org_by_customer_id(invoice.customer)
-      if org and org.organization:
-        admin_org = AdministerOrganizationPermission(org.username)
-        if admin_org.can():
-          file_data = renderInvoiceToPdf(invoice, org)          
-          return Response(file_data,
-                          mimetype="application/pdf",
-                          headers={"Content-Disposition":
-                                     "attachment;filename=receipt.pdf"})
+      user_or_org = model.get_user_or_org_by_customer_id(invoice.customer)
+      
+      if user_or_org:
+        if user_or_org.organization:
+          admin_org = AdministerOrganizationPermission(user_or_org.username)
+          if not admin_org.can():
+            abort(404)
+            return
+        else:
+          if not user_or_org.username == current_user.db_user().username:
+            abort(404)
+            return      
+
+      file_data = renderInvoiceToPdf(invoice, user_or_org)          
+      return Response(file_data,
+                      mimetype="application/pdf",
+                      headers={"Content-Disposition": "attachment;filename=receipt.pdf"})
   abort(404)
 
-def common_login(db_user):
-  if login_user(_LoginWrappedDBUser(db_user.username, db_user)):
-    logger.debug('Successfully signed in as: %s' % db_user.username)
-    new_identity = QuayDeferredPermissionUser(db_user.username, 'username')
-    identity_changed.send(app, identity=new_identity)
-    return True
-  else:
-    logger.debug('User could not be logged in, inactive?.')
-    return False
 
-
-@app.route('/oauth2/github/callback', methods=['GET'])
-def github_oauth_callback():
+def exchange_github_code_for_token(code):
   code = request.args.get('code')
   payload = {
     'client_id': app.config['GITHUB_CLIENT_ID'],
@@ -181,19 +176,37 @@ def github_oauth_callback():
                                    params=payload, headers=headers)
 
   token = get_access_token.json()['access_token']
+  return token
 
+
+def get_github_user(token):
   token_param = {
     'access_token': token,
   }
   get_user = requests.get(app.config['GITHUB_USER_URL'], params=token_param)
 
-  user_data = get_user.json()
+  return get_user.json()
+
+
+@app.route('/oauth2/github/callback', methods=['GET'])
+def github_oauth_callback():
+  error = request.args.get('error', None)
+  if error:
+    return render_page_template('githuberror.html', error_message=error)
+
+  token = exchange_github_code_for_token(request.args.get('code'))
+  user_data = get_github_user(token)
+
   username = user_data['login']
   github_id = user_data['id']
 
   v3_media_type = {
     'Accept': 'application/vnd.github.v3'
   }
+
+  token_param = {
+    'access_token': token,
+  }
   get_email = requests.get(app.config['GITHUB_USER_EMAILS'],
                            params=token_param, headers=v3_media_type)
 
@@ -220,18 +233,33 @@ def github_oauth_callback():
         mixpanel.alias(to_login.username, state)
 
     except model.DataModelException, ex:
-      return render_template('githuberror.html', error_message=ex.message)
+      return render_page_template('githuberror.html', error_message=ex.message)
 
   if common_login(to_login):
     return redirect(url_for('index'))
 
-  return render_template('githuberror.html')
+  return render_page_template('githuberror.html')
+
+
+@app.route('/oauth2/github/callback/attach', methods=['GET'])
+@login_required
+def github_oauth_attach():
+  token = exchange_github_code_for_token(request.args.get('code'))
+  user_data = get_github_user(token)
+  github_id = user_data['id']
+  user_obj = current_user.db_user()
+  model.attach_federated_login(user_obj, 'github', github_id)
+  return redirect(url_for('user'))
 
 
 @app.route('/confirm', methods=['GET'])
 def confirm_email():
   code = request.values['code']
-  user = model.confirm_user_email(code)
+
+  try:
+    user = model.confirm_user_email(code)
+  except model.DataModelException as ex:
+    return redirect(url_for('signin'))
 
   common_login(user)
 
@@ -248,8 +276,3 @@ def confirm_recovery():
     return redirect(url_for('user'))
   else:
     abort(403)
-
-
-@app.route('/reset', methods=['GET'])
-def password_reset():
-  pass
diff --git a/endpoints/webhooks.py b/endpoints/webhooks.py
index 9675fe000..f93ef7a70 100644
--- a/endpoints/webhooks.py
+++ b/endpoints/webhooks.py
@@ -1,19 +1,14 @@
 import logging
-import requests
 import stripe
 
-from flask import (abort, redirect, request, url_for, render_template,
-                   make_response)
-from flask.ext.login import login_user, UserMixin, login_required
-from flask.ext.principal import identity_changed, Identity, AnonymousIdentity
+from flask import request, make_response
 
 from data import model
-from app import app, login_manager, mixpanel
-from auth.permissions import QuayDeferredPermissionUser
-from data.plans import USER_PLANS, BUSINESS_PLANS, get_plan
+from app import app
 from util.invoice import renderInvoiceToHtml
 from util.email import send_invoice_email
 
+
 logger = logging.getLogger(__name__)
 
 
@@ -33,10 +28,10 @@ def stripe_webhook():
       # Find the user associated with the customer ID.
       user = model.get_user_or_org_by_customer_id(customer_id)
       if user and user.invoice_email:
-         # Lookup the invoice.
-         invoice = stripe.Invoice.retrieve(invoice_id)
-         if invoice:
-           invoice_html = renderInvoiceToHtml(invoice, user)
-           send_invoice_email(user.email, invoice_html)
+        # Lookup the invoice.
+        invoice = stripe.Invoice.retrieve(invoice_id)
+        if invoice:
+          invoice_html = renderInvoiceToHtml(invoice, user)
+          send_invoice_email(user.email, invoice_html)
 
   return make_response('Okay')
diff --git a/gunicorn_config.py b/gunicorn_config.py
new file mode 100644
index 000000000..59141b06d
--- /dev/null
+++ b/gunicorn_config.py
@@ -0,0 +1,5 @@
+bind = 'unix:/tmp/gunicorn.sock'
+workers = 8
+worker_class = 'gevent'
+timeout = 2000
+daemon = True
diff --git a/initdb.py b/initdb.py
index 5dc75e52f..2cd57708f 100644
--- a/initdb.py
+++ b/initdb.py
@@ -1,11 +1,9 @@
 import logging
-import string
-import shutil
-import os
+import json
 import hashlib
+import random
 
 from datetime import datetime, timedelta
-from flask import url_for
 from peewee import SqliteDatabase, create_model_tables, drop_model_tables
 
 from data.database import *
@@ -18,6 +16,15 @@ store = app.config['STORAGE']
 
 SAMPLE_DIFFS = ['test/data/sample/diffs/diffs%s.json' % i
                 for i in range(1, 10)]
+SAMPLE_CMDS = [["/bin/bash"],
+               ["/bin/sh", "-c",
+                "echo \"PasswordAuthentication no\" >> /etc/ssh/sshd_config"],
+               ["/bin/sh", "-c",
+                "sed -i 's/#\\(force_color_prompt\\)/\\1/' /etc/skel/.bashrc"],
+               ["/bin/sh", "-c", "#(nop) EXPOSE [8080]"],
+               ["/bin/sh", "-c", 
+                "#(nop) MAINTAINER Jake Moshenko <jake@devtable.com>"],
+               None]
 
 REFERENCE_DATE = datetime(2013, 6, 23)
 TEST_STRIPE_ID = 'cus_2tmnh3PkXQS8NG'
@@ -51,9 +58,14 @@ def __create_subtree(repo, structure, parent):
     model.set_image_checksum(docker_image_id, repo, checksum)
 
     creation_time = REFERENCE_DATE + timedelta(days=image_num)
+    command_list = SAMPLE_CMDS[image_num % len(SAMPLE_CMDS)]
+    command = json.dumps(command_list) if command_list else None
     new_image = model.set_image_metadata(docker_image_id, repo.namespace,
                                          repo.name, str(creation_time),
-                                         'no comment', parent)
+                                         'no comment', command, parent)
+
+    model.set_image_size(docker_image_id, repo.namespace, repo.name,
+                         random.randrange(1, 1024 * 1024 * 1024))
 
     # Populate the diff file
     diff_path = store.image_file_diffs_path(repo.namespace, repo.name,
@@ -123,6 +135,7 @@ def initialize_database():
   LogEntryKind.create(name='push_repo')
   LogEntryKind.create(name='pull_repo')
   LogEntryKind.create(name='delete_repo')
+  LogEntryKind.create(name='delete_tag')
   LogEntryKind.create(name='add_repo_permission')
   LogEntryKind.create(name='change_repo_permission')
   LogEntryKind.create(name='delete_repo_permission')
@@ -160,6 +173,7 @@ def populate_database():
   new_user_1 = model.create_user('devtable', 'password',
                                  'jschorr@devtable.com')
   new_user_1.verified = True
+  new_user_1.stripe_id = TEST_STRIPE_ID
   new_user_1.save()
 
   model.create_robot('dtrobot', new_user_1)
@@ -279,6 +293,12 @@ def populate_database():
   model.log_action('pull_repo', org.username, repository=org_repo, timestamp=today,
                    metadata={'token': 'sometoken', 'token_code': 'somecode', 'repo': 'orgrepo'})
 
+  model.log_action('delete_tag', org.username, performer=new_user_2, repository=org_repo, timestamp=today,
+                   metadata={'username': new_user_2.username, 'repo': 'orgrepo', 'tag': 'sometag'})
+
+  model.log_action('pull_repo', org.username, repository=org_repo, timestamp=today,
+                   metadata={'token_code': 'somecode', 'repo': 'orgrepo'})
+
 if __name__ == '__main__':
   logging.basicConfig(**app.config['LOGGING_CONFIG'])
   initialize_database()
diff --git a/nginx-staging.conf b/nginx-staging.conf
index 68e88b274..b29bda2c5 100644
--- a/nginx-staging.conf
+++ b/nginx-staging.conf
@@ -1,8 +1,8 @@
-worker_processes 1;
+worker_processes 2;
 
 user root nogroup;
-pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+pid /mnt/nginx/nginx.pid;
+error_log /mnt/nginx/nginx.error.log;
 
 events {
     worker_connections 1024;
@@ -11,10 +11,10 @@ events {
 
 http {
     types_hash_max_size 2048;
-    include /etc/nginx/mime.types;
+    include /usr/local/nginx/conf/mime.types.default;
 
     default_type application/octet-stream;
-    access_log /tmp/nginx.access.log combined;
+    access_log /mnt/nginx/nginx.access.log combined;
     sendfile on;
 
     root /root/quay/;
@@ -43,6 +43,7 @@ http {
     server {
         listen 443 default;
         client_max_body_size 8G;
+        client_body_temp_path /mnt/nginx/client_body 1 2;
         server_name _;
 
         keepalive_timeout 5;
@@ -71,8 +72,12 @@ http {
             proxy_redirect off;
             proxy_buffering off;
 
+            proxy_request_buffering off;
+            proxy_set_header Transfer-Encoding $http_transfer_encoding;
+
             proxy_pass   http://app_server;
             proxy_read_timeout 2000;
+            proxy_temp_path /mnt/nginx/proxy_temp 1 2;
         }
     }
 }
diff --git a/nginx.conf b/nginx.conf
index 536e09303..53cd3c9f8 100644
--- a/nginx.conf
+++ b/nginx.conf
@@ -1,8 +1,8 @@
-worker_processes 1;
+worker_processes 8;
 
 user nobody nogroup;
-pid /tmp/nginx.pid;
-error_log /tmp/nginx.error.log;
+pid /mnt/nginx/nginx.pid;
+error_log /mnt/nginx/nginx.error.log;
 
 events {
     worker_connections 1024;
@@ -11,10 +11,10 @@ events {
 
 http {
     types_hash_max_size 2048;
-    include /etc/nginx/mime.types;
+    include /usr/local/nginx/conf/mime.types.default;
 
     default_type application/octet-stream;
-    access_log /tmp/nginx.access.log combined;
+    access_log /mnt/nginx/nginx.access.log combined;
     sendfile on;
 
     gzip on;
@@ -41,6 +41,7 @@ http {
     server {
         listen 443 default;
         client_max_body_size 8G;
+        client_body_temp_path /mnt/nginx/client_body 1 2;
         server_name _;
 
         keepalive_timeout 5;
@@ -69,8 +70,12 @@ http {
             proxy_redirect off;
             proxy_buffering off;
 
+            proxy_request_buffering off;
+            proxy_set_header Transfer-Encoding $http_transfer_encoding;
+
             proxy_pass   http://app_server;
             proxy_read_timeout 2000;
+            proxy_temp_path /mnt/nginx/proxy_temp 1 2;
         }
     }
 }
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index 712c818c8..ce9a22c54 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,20 +1,20 @@
 APScheduler==2.1.1
 Flask==0.10.1
-Flask-Login==0.2.7
+Flask-Login==0.2.9
 Flask-Mail==0.9.0
 Flask-Principal==0.4.0
 Jinja2==2.7.1
 MarkupSafe==0.18
-Pillow==2.2.1
+Pillow==2.3.0
 PyMySQL==0.6.1
 Werkzeug==0.9.4
 argparse==1.2.1
 beautifulsoup4==4.3.2
 blinker==1.3
-boto==2.17.0
+boto==2.21.2
 distribute==0.6.34
 ecdsa==0.10
-gevent==0.13.8
+gevent==1.0
 greenlet==0.4.1
 gunicorn==18.0
 html5lib==1.0b3
@@ -23,16 +23,16 @@ lockfile==0.9.1
 marisa-trie==0.5.1
 mixpanel-py==3.0.0
 paramiko==1.12.0
-peewee==2.1.5
+peewee==2.1.7
 py-bcrypt==0.4
 pyPdf==1.13
 pycrypto==2.6.1
 python-daemon==1.6
 python-dateutil==2.2
-python-digitalocean==0.5.1
+python-digitalocean==0.6
 reportlab==2.7
-requests==2.0.1
+requests==2.1.0
 six==1.4.1
-stripe==1.9.8
+stripe==1.11.0
 wsgiref==0.1.2
 xhtml2pdf==0.0.5
diff --git a/screenshots/screenshots.js b/screenshots/screenshots.js
index a58666c57..9999eb8a8 100644
--- a/screenshots/screenshots.js
+++ b/screenshots/screenshots.js
@@ -10,20 +10,6 @@ var casper = require('casper').create({
   logLevel: "debug"
 });
 
-var disableOlark = function() {
-  casper.then(function() {
-    this.waitForText('Chat with us!', function() {
-      this.evaluate(function() {
-        console.log(olark);
-        window.olark.configure('box.start_hidden', true);
-        window.olark('api.box.hide');
-      });
-    }, function() {
-      // Do nothing, if olark never loaded we're ok with that
-    });
-  });
-};
-
 var options = casper.cli.options;
 var isDebug = !!options['d'];
 
@@ -56,12 +42,18 @@ casper.thenClick('.form-signin button[type=submit]', function() {
   this.waitForText('Top Repositories');
 });
 
-disableOlark();
+casper.then(function() {
+  this.log('Generating user home screenshot.');
+});
 
 casper.then(function() {
   this.capture(outputDir + 'user-home.png');
 });
 
+casper.then(function() {
+  this.log('Generating repository view screenshot.');
+});
+
 casper.thenOpen(rootUrl + 'repository/devtable/' + repo + '?tag=v2.0', function() {
   // Wait for the tree to initialize.
   this.waitForSelector('.image-tree', function() {
@@ -70,12 +62,14 @@ casper.thenOpen(rootUrl + 'repository/devtable/' + repo + '?tag=v2.0', function(
   });
 });
 
-disableOlark();
-
 casper.then(function() {
   this.capture(outputDir + 'repo-view.png');
 });
 
+casper.then(function() {
+  this.log('Generating repository changes screenshot.');
+});
+
 casper.thenClick('#current-image dd a', function() {
   this.waitForSelector('.result-count', function() {
     this.capture(outputDir + 'repo-changes.png', {
@@ -87,58 +81,79 @@ casper.thenClick('#current-image dd a', function() {
   });
 })
 
+casper.then(function() {
+  this.log('Generating repository admin screenshot.');
+});
+
 casper.thenOpen(rootUrl + 'repository/devtable/' + repo + '/admin', function() {
   this.waitForSelector('.repo-access-state');
 });
 
-disableOlark();
-
 casper.then(function() {
   this.capture(outputDir + 'repo-admin.png');
 });
 
+casper.then(function() {
+  this.log('Generating organization repo list screenshot.');
+});
+
 casper.thenOpen(rootUrl + 'repository/?namespace=' + org, function() {
   this.waitForText('Repositories');
 });
 
-disableOlark();
-
 casper.then(function() {
   this.capture(outputDir + 'org-repo-list.png');
 });
 
+casper.then(function() {
+  this.log('Generating organization teams screenshot.');
+});
+
 casper.thenOpen(rootUrl + 'organization/' + org, function() {
   this.waitForSelector('.organization-name');
 });
 
-disableOlark();
-
 casper.then(function() {
   this.capture(outputDir + 'org-teams.png');
 });
 
+casper.then(function() {
+  this.log('Generating organization admin screenshot.');
+});
+
 casper.thenOpen(rootUrl + 'organization/' + org + '/admin', function() {
   this.waitForSelector('#repository-usage-chart');
 });
 
-disableOlark();
-
 casper.then(function() {
   this.capture(outputDir + 'org-admin.png');
 });
 
+casper.then(function() {
+  this.log('Generating organization logs screenshot.');
+});
+
 casper.thenClick('a[data-target="#logs"]', function() {
   this.waitForSelector('svg > g', function() {
-    this.capture(outputDir + 'org-logs.png');
+    this.wait(1000, function() {
+      this.capture(outputDir + 'org-logs.png', {
+        top: 0,
+        left: 0,
+        width: width,
+        height: height + 200
+      });
+    });
   });
 });
 
+casper.then(function() {
+  this.log('Generating oganization repository admin screenshot.');
+});
+
 casper.thenOpen(rootUrl + 'repository/' + org + '/' + orgrepo + '/admin', function() {
   this.waitForText('outsideorg')
 });
 
-disableOlark();
-
 casper.then(function() {
   this.capture(outputDir + 'org-repo-admin.png');
 });
diff --git a/static/css/quay.css b/static/css/quay.css
index 6f5842db8..b7c394d0e 100644
--- a/static/css/quay.css
+++ b/static/css/quay.css
@@ -3,6 +3,76 @@
   margin: 0;
 }
 
+@media (max-width: 410px) {
+  .olrk-normal {
+    display: none;
+  }
+}
+
+.codetooltipcontainer .tooltip-inner {
+    white-space:pre;
+    max-width:none;
+}
+
+.codetooltip {
+  font-family: Consolas, "Lucida Console", Monaco, monospace;
+  display: block;
+}
+
+.resource-view-element {
+  position: relative;
+}
+
+.resource-view-element .resource-spinner {
+  z-index: 1;
+  position: absolute;
+  top: 10px;
+  left: 10px;
+  opacity: 0;
+  transition: opacity 0s ease-in-out;
+  text-align: center;
+}
+
+.resource-view-element .resource-content {
+  visibility: hidden;
+}
+
+.resource-view-element .resource-content.visible {
+  z-index: 2;
+  visibility: visible;
+}
+
+.resource-view-element .resource-error {
+  margin: 10px;
+  font-size: 16px;
+  color: #444;
+  text-align: center;
+}
+
+.resource-view-element .resource-spinner.visible {
+  opacity: 1;
+  transition: opacity 1s ease-in-out;
+}
+
+.small-spinner {
+  display: inline-block;
+  width: 14px;
+  height: 14px;
+  border: solid 2px transparent;
+  border-top-color: #444;
+  border-left-color: #444;
+  border-radius: 10px;
+  -webkit-animation: loading-bar-spinner 400ms linear infinite;
+  -moz-animation: loading-bar-spinner 400ms linear infinite;
+  -ms-animation: loading-bar-spinner 400ms linear infinite;
+  -o-animation: loading-bar-spinner 400ms linear infinite;
+  animation: loading-bar-spinner 400ms linear infinite;
+}
+
+#loading-bar-spinner {
+  top: 70px;
+}
+
 .entity-search-element input {
   vertical-align: middle;
 }
@@ -48,10 +118,7 @@ html, body {
 .tooltip {
   word-break: normal !important;
   word-wrap: normal !important;
-}
-
-.code-info {
-  border-bottom: 1px dashed #aaa;
+  pointer-events: none;
 }
 
 .toggle-icon {
@@ -136,12 +203,11 @@ i.toggle-icon:hover {
   min-height: 100%;
   height: auto !important;
   height: 100%;
-  margin: 0 auto -136px;
+  margin: 0 auto -176px;
 }
 
 .footer-container, .push {
-  height: 110px;
-  overflow: hidden;
+  height: 74px;
 }
 
 .footer-container.fixed {
@@ -193,6 +259,10 @@ i.toggle-icon:hover {
   margin-left: 10px;
 }
 
+.logs-view-element .logs-date-picker {
+  width: 122px;
+}
+
 .logs-view-element .header input {
   font-size: 14px;
   text-align: center;
@@ -608,49 +678,165 @@ i.toggle-icon:hover {
 
 .plans-list .plan {
   vertical-align: top;
-
-  padding: 10px;
-  border: 1px solid #eee;
-  border-top: 4px solid #94C9F7;
   font-size: 1.4em;
-  margin-top: 5px;
-}
-
-.plans-list .plan.small {
-  border: 1px solid #ddd;
-  border-top: 4px solid #428bca;
-  margin-top: 0px;
-  font-size: 1.6em;
-}
-
-.plans-list .plan.business-plan {
-  border: 1px solid #eee;
-  border-top: 4px solid #94F794;
 }
 
 .plans-list .plan.bus-small {
-  border: 1px solid #ddd;
-  border-top: 4px solid #47A447;
-  margin-top: 0px;
-  font-size: 1.6em;
+  border-top: 6px solid #46ac39;
+  margin-top: -10px;
+}
+
+.plans-list .plan.bus-small .plan-box {
+  background: black !important;
 }
 
 .plans-list .plan:last-child {
   margin-right:  0px;
 }
 
+.plans-list .plan .plan-box {
+  background: #444;
+  padding: 10px;
+  color: white;
+}
+
 .plans-list .plan .plan-title {
+  text-transform: uppercase;
+  padding-top: 25px;
+  padding-bottom: 20px;
   margin-bottom: 10px;
-  display: block;
   font-weight: bold;
+  border-bottom: 1px solid #eee;
+}
+
+.visible-sm-inline {
+  display: none;
+}
+
+.hidden-sm-inline {
+  display: inline;
+}     
+
+@media (max-width: 991px) and (min-width: 768px) {
+  .visible-sm-inline {
+    display: inline;
+  }
+
+  .hidden-sm-inline {
+    display: none;
+  }
+}
+
+.plans-list .plan-box .description {
+  color: white;
+  margin-top: 6px;
+  font-size: 12px !important;
+}
+
+.plans-list .plan button {
+  margin-top: 6px;
+  margin-bottom: 6px;
+}
+
+.plans-list .plan.bus-small button {
+  font-size: 1em;
+}
+
+.plans-list .features-bar {
+  padding-top: 248px;
+}
+
+.plans-list .features-bar .feature .count {
+  padding: 10px;
+}
+
+.plans-list .features-bar .feature {
+  height: 43px;
+  text-align: right;
+  white-space: nowrap;
+}
+
+.context-tooltip {
+  border-bottom: 1px dotted black;
+  cursor: default;
+}
+
+.plans-list .features-bar .feature i {
+  margin-left: 16px;
+  float: right;
+  width: 16px;
+  font-size: 16px;
+  text-align: center;
+  margin-top: 2px;
+}
+
+.plans-list .plan .features {
+  padding: 6px;
+  background: #eee;
+  padding-bottom: 0px;
+}
+
+.plans-list .plan .feature {
+  text-align: center;
+  padding: 10px;
+  border-bottom: 1px solid #ddd;
+  font-size: 14px;
+}
+
+.plans-list .plan .feature:after {
+  content: "";
+  border-radius: 50%;
+  display: inline-block;
+  width: 16px;
+  height: 16px;
+}
+
+.plans-list .plan .visible-xs .feature {
+  text-align: left;
+}
+
+.plans-list .plan .visible-xs .feature:after {
+  float: left;
+  margin-right: 10px;
+}
+
+.plans-list .plan .feature.notpresent {
+  color: #ccc;
+}
+
+.plans-list .plan .feature.present:after {
+  background: #428bca;
+}
+
+.plans-list .plan.business-plan .feature.present:after {
+  background: #46ac39;
+}
+
+.plans-list .plan .count, .plans-list .features-bar .count {
+  background: white;
+  border-bottom: 0px;
+  text-align: center !important;
+  font-size: 14px;
+  padding: 10px;
+}
+
+.plans-list .plan .count b, .plans-list .features-bar .count b {
+  font-size: 1.5em;
+  display: block;
+}
+
+.plans-list .plan .feature:last-child {
+  border-bottom: 0px;
+}
+
+.plans-list .plan-price {
+  margin-bottom: 10px;
 }
 
 .plan-price {
-  margin-bottom: 10px;
   display: block;
   font-weight: bold;
   font-size: 1.8em;
-
   position: relative;
 }
 
@@ -678,7 +864,8 @@ i.toggle-icon:hover {
 .plans-list .plan .description {
   font-size: 1em;
   font-size: 16px;
-  margin-bottom: 10px;
+  height: 34px;
+
 }
 
 .plans-list .plan .smaller {
@@ -829,12 +1016,20 @@ form input.ng-valid.ng-dirty,
 }
 
 .page-footer {
+  padding: 10px;
+  padding-bottom: 0px;
+  border-top: 1px solid #eee;
+}
+
+.page-footer-padder {
+  margin-top: 76px;
   background-color: white;
   background-image: none;
-  padding: 10px;
-  padding-bottom: 40px;
-  margin-top: 52px;
-  border-top: 1px solid #eee;
+
+  overflow: hidden;
+  width: 100%;
+  height: 80px;
+  padding-top: 24px;
 }
 
 .page-footer .row {
@@ -909,12 +1104,20 @@ form input.ng-valid.ng-dirty,
 .entity-mini-listing {
   margin: 2px;
   white-space: nowrap !important;
+  position: relative;
 }
 
 .entity-mini-listing i {
   margin-right: 8px;
 }
 
+.entity-mini-listing i.fa-exclamation-triangle {
+  position: absolute;
+  right: -16px;
+  top: 4px;
+  color: #c09853;
+}
+
 .entity-mini-listing .warning {
   margin-top: 6px;
   font-size: 10px;
@@ -967,20 +1170,84 @@ p.editable:hover i {
   font-size: 1.15em;
 }
 
+#tagContextMenu {
+  display: none;
+  position: absolute;
+  z-index: 100000;
+  outline: none;
+}
+
+#tagContextMenu ul {
+  display: block;
+  position: static;
+  margin-bottom: 5px;
+}
+
+.tag-controls {
+  display: inline-block;
+  margin-right: 20px;
+  margin-top: 2px;
+  opacity: 0;
+  float: right;
+  -webkit-transition: opacity 200ms ease-in-out;
+  -moz-transition: opacity 200ms ease-in-out;
+  transition: opacity 200ms ease-in-out;
+}
+
 .right-title {
   display: inline-block;
   float: right;
-  padding: 4px;
   font-size: 12px;
   color: #aaa;
 }
 
-.tag-dropdown .tag-count {
+.right-tag-controls {
+  display: inline-block;
+  float: right;
+  padding: 4px;
+  padding-left: 10px;
+  border-left: 1px solid #ccc;
+  vertical-align: middle;
+  margin-top: -2px;
+  margin-right: -10px;
+  color: #666;
+}
+
+.right-tag-controls .tag-count {
   display: inline-block;
   margin-left: 4px;
   margin-right: 6px;
-  padding-right: 10px;
-  border-right: 1px solid #ccc;
+}
+
+.tag-image-sizes .tag-image-size {
+  height: 22px;
+  position: relative;
+}
+
+.tag-image-sizes .tag-image-size .size-title {
+  position: absolute;
+  right: 0px;
+  top: 0px;
+  font-size: 12px;
+}
+
+.tag-image-sizes .tag-image-size .size-limiter {
+  display: inline-block;
+  padding-right: 90px;
+  width: 100%;
+}
+
+.tag-image-sizes .tag-image-size .size-bar {
+  display: inline-block;
+  background: steelblue;
+  height: 12px;
+}
+
+#current-tag .control-bar {
+  margin-top: 10px;
+  padding-top: 10px;
+  border-top: 1px solid #eee;
+  text-align: right;
 }
 
 .tag-dropdown a {
@@ -993,6 +1260,61 @@ p.editable:hover i {
   border: 0px;
 }
 
+#confirmdeleteTagModal .image-listings {
+  margin: 10px;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing {
+  margin: 4px;
+  padding: 2px;
+  position: relative;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing .image-listing-id {
+  display: inline-block;
+  margin-left: 20px;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing .image-listing-line {
+  border-left: 2px solid steelblue;
+  display: inline-block;
+  position: absolute;
+  top: -2px;
+  bottom: 8px;
+  left: 6px;
+  width: 1px;
+  z-index: 1;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing.tag-image .image-listing-line {
+  top: 8px;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing.child .image-listing-line {
+  bottom: -2px;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing .image-listing-circle {
+  position: absolute;
+  top: 8px;
+
+  border-radius: 50%;
+  border: 2px solid steelblue;
+  width: 10px;
+  height: 10px;
+  display: inline-block;
+  background: white;
+  z-index: 2;
+}
+
+#confirmdeleteTagModal .image-listings .image-listing.tag-image .image-listing-circle {
+  background: steelblue;
+}
+
+#confirmdeleteTagModal .more-changes {
+  margin-left: 16px;
+}
+
 .repo .header {
   margin-bottom: 10px;
   position: relative;
@@ -1009,7 +1331,7 @@ p.editable:hover i {
 
 .repo .description {
   margin-top: 10px;
-  margin-bottom: 40px;
+  margin-bottom: 20px;
 }
 
 .repo .empty-message {
@@ -1343,6 +1665,18 @@ p.editable:hover i {
   padding-top: 4px;
 }
 
+.repo .formatted-command {
+  margin-top: 4px;
+  padding: 4px;
+  font-size: 12px;
+}
+
+.repo .formatted-command.trimmed {
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
+}
+
 .repo .changes-count-container {
   text-align: center;
 }
@@ -1567,6 +1901,10 @@ p.editable:hover i {
   margin-top: 10px;
 }
 
+.user-admin .check-green {
+  color: #46ac39;
+}
+
 #image-history-container {
   overflow: hidden;
   min-height: 400px;
@@ -1617,7 +1955,7 @@ p.editable:hover i {
   text-align: center;
 }
 
-#image-history-container .tags .tag {
+#image-history-container .tags .tag, #confirmdeleteTagModal .tag {
   border-radius: 10px;
   margin-right: 4px;
   cursor: pointer;
@@ -1864,28 +2202,28 @@ p.editable:hover i {
   display: inline-block;
 }
 
-.org-admin .invoice-title {
+.billing-invoices-element .invoice-title {
   padding: 6px;
   cursor: pointer;
 }
 
-.org-admin .invoice-status .success {
+.billing-invoices-element .invoice-status .success {
   color: green;
 }
 
-.org-admin .invoice-status .pending {
+.billing-invoices-element .invoice-status .pending {
   color: steelblue;
 }
 
-.org-admin .invoice-status .danger {
+.billing-invoices-element .invoice-status .danger {
   color: red;
 }
 
-.org-admin .invoice-amount:before {
+.billing-invoices-element .invoice-amount:before {
   content: '$';
 }
 
-.org-admin .invoice-details {
+.billing-invoices-element .invoice-details {
   margin-left: 10px;
   margin-bottom: 10px;
 
@@ -1894,21 +2232,21 @@ p.editable:hover i {
   border-left: 2px solid #eee !important;
 }
 
-.org-admin .invoice-details td {
+.billing-invoices-element .invoice-details td {
   border: 0px solid transparent !important;
 }
 
-.org-admin .invoice-details dl {
+.billing-invoices-element .invoice-details dl {
   margin: 0px;
 }
 
-.org-admin .invoice-details dd {
+.billing-invoices-element .invoice-details dd {
   margin-left: 10px;
   padding: 6px;
   margin-bottom: 10px;
 }
 
-.org-admin .invoice-title:hover {
+.billing-invoices-element .invoice-title:hover {
   color: steelblue;
 }
 
@@ -2034,6 +2372,14 @@ p.editable:hover i {
   margin-bottom: 0px;
 }
 
+.plan-manager-element .plans-list-table .deprecated-plan {
+  color: #aaa;
+}
+
+.plan-manager-element .plans-list-table .deprecated-plan-label {
+  font-size: 0.7em;
+}
+
 .plans-table-element table {
   margin: 20px;
   border: 1px solid #eee;
@@ -2179,16 +2525,37 @@ p.editable:hover i {
   display: block;
 }
 
-.d3-tip .created {
+.d3-tip .command {
   font-size: 12px;
   color: white;
   display: block;
-  margin-bottom: 6px;
+  font-family: Consolas, "Lucida Console", Monaco, monospace;
+}
+
+.d3-tip .info-line {
+  display: block;
+  margin-top: 6px;
+  padding-top: 6px;
+}
+
+.d3-tip .info-line i {
+  margin-right: 10px;
+  font-size: 14px;
+  color: #888;
 }
 
 .d3-tip .comment {
   display: block;
   font-size: 14px;
+  padding-bottom: 4px;
+  margin-bottom: 10px;
+  border-bottom: 1px dotted #ccc;
+}
+
+.d3-tip .created {
+  font-size: 12px;
+  color: white;
+  display: block;
   margin-bottom: 6px;
 }
 
diff --git a/static/directives/billing-invoices.html b/static/directives/billing-invoices.html
new file mode 100644
index 000000000..fc64b1abf
--- /dev/null
+++ b/static/directives/billing-invoices.html
@@ -0,0 +1,53 @@
+<div class="billing-invoices-element">
+  <div ng-show="loading">
+    <div class="quay-spinner"></div>
+  </div>
+
+  <div ng-show="!loading && !invoices">
+    No invoices have been created
+  </div>
+
+  <div ng-show="!loading && invoices">
+    <table class="table">
+      <thead>
+        <th>Billing Date/Time</th>
+        <th>Amount Due</th>
+        <th>Status</th>
+        <th></th>
+      </thead>
+      
+      <tbody class="invoice" ng-repeat="invoice in invoices">
+        <tr class="invoice-title">
+          <td ng-click="toggleInvoice(invoice.id)"><span class="invoice-datetime">{{ invoice.date * 1000 | date:'medium' }}</span></td>
+          <td ng-click="toggleInvoice(invoice.id)"><span class="invoice-amount">{{ invoice.amount_due / 100 }}</span></td>
+          <td>
+            <span class="invoice-status">
+              <span class="success" ng-show="invoice.paid">Paid - Thank you!</span>
+              <span class="danger" ng-show="!invoice.paid && invoice.attempted && invoice.closed">Payment failed</span>
+              <span class="danger" ng-show="!invoice.paid && invoice.attempted && !invoice.closed">Payment failed - Will retry soon</span>
+              <span class="pending" ng-show="!invoice.paid && !invoice.attempted">Payment pending</span>
+            </span>
+          </td>
+          <td>
+            <a ng-show="invoice.paid" href="/receipt?id={{ invoice.id }}" download="receipt.pdf" target="_new">
+              <i class="fa fa-download" title="Download Receipt" bs-tooltip="tooltip.title"></i>
+            </a>
+          </td>
+        </tr>
+
+        <tr ng-class="invoiceExpanded[invoice.id] ? 'in' : 'out'" class="invoice-details panel-collapse collapse">
+          <td colspan="3">
+            <dl class="dl-normal">
+              <dt>Billing Period</dt>
+              <dd>
+                <span>{{ invoice.period_start * 1000 | date:'mediumDate' }}</span> -
+                <span>{{ invoice.period_end * 1000 | date:'mediumDate' }}</span>
+              </dd>
+            </dl>
+          </td>
+        </tr>
+      </tbody>
+    </table>
+  </div>
+
+</div>
diff --git a/static/directives/billing-options.html b/static/directives/billing-options.html
index 598586bcb..8ae5115d5 100644
--- a/static/directives/billing-options.html
+++ b/static/directives/billing-options.html
@@ -5,9 +5,9 @@
       Credit Card
     </div>
     <div class="panel-body">
-      <i class="fa fa-spinner fa-spin fa-2x" ng-show="!currentCard || changingCard"></i>
+      <div class="quay-spinner" ng-show="!currentCard || changingCard"></div>
       <div class="current-card" ng-show="currentCard && !changingCard">
-        <img src="{{ '/static/img/creditcards/' + getCreditImage(currentCard) }}" ng-show="currentCard.last4">
+        <img ng-src="{{ '/static/img/creditcards/' + getCreditImage(currentCard) }}" ng-show="currentCard.last4">
         <span class="no-card-outline" ng-show="!currentCard.last4"></span>
 
         <span class="last4" ng-show="currentCard.last4">****-****-****-<b>{{ currentCard.last4 }}</b></span>
@@ -24,7 +24,7 @@
   <div class="panel">
     <div class="panel-title">
       Billing Options
-      <i class="fa fa-spinner fa-spin" ng-show="working"></i>
+      <div class="quay-spinner" ng-show="working"></div>
     </div>
     <div class="panel-body">
       <div class="settings-option">
diff --git a/static/directives/entity-search.html b/static/directives/entity-search.html
index fb4a6cf24..68f15b1cd 100644
--- a/static/directives/entity-search.html
+++ b/static/directives/entity-search.html
@@ -5,7 +5,7 @@
       <span class="caret"></span>
     </button>
     <ul class="dropdown-menu" role="menu" aria-labelledby="entityDropdownMenu">
-      <li ng-show="lazyLoading"><i class="fa fa-spinner"></i></li>
+      <li ng-show="lazyLoading" style="padding: 10px"><div class="quay-spinner"></div></li>
       
       <li role="presentation" ng-repeat="team in teams" ng-show="!lazyLoading"
           ng-click="setEntity(team.name, 'team', false)">
diff --git a/static/directives/header-bar.html b/static/directives/header-bar.html
index 169c9bf06..32ee88d23 100644
--- a/static/directives/header-bar.html
+++ b/static/directives/header-bar.html
@@ -38,14 +38,21 @@
       <a href="javascript:void(0)" class="dropdown-toggle user-dropdown" data-toggle="dropdown">
         <img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=32&d=identicon" />
         {{ user.username }}
-        <span class="badge user-notification notification-animated" ng-show="user.askForPassword">1</span>
+        <span class="badge user-notification notification-animated" ng-show="user.askForPassword || overPlan"
+              bs-tooltip="(user.askForPassword ? 'A password is needed for this account<br>' : '') + (overPlan ? 'You are using more private repositories than your plan allows' : '')"
+              data-placement="left"
+              data-container="body">
+          {{ (user.askForPassword ? 1 : 0) + (overPlan ? 1 : 0) }}
+        </span>
         <b class="caret"></b>
       </a>
       <ul class="dropdown-menu">
         <li>
           <a href="/user/" target="{{ appLinkTarget() }}">
             Account Settings
-            <span class="badge user-notification" ng-show="user.askForPassword">1</span>
+            <span class="badge user-notification" ng-show="user.askForPassword || overPlan">
+              {{ (user.askForPassword ? 1 : 0) + (overPlan ? 1 : 0) }}
+            </span>
           </a>
         </li>
         <li><a ng-href="/organizations/" target="{{ appLinkTarget() }}">Organizations</a></li>
diff --git a/static/directives/loading-status.html b/static/directives/loading-status.html
new file mode 100644
index 000000000..9ed712459
--- /dev/null
+++ b/static/directives/loading-status.html
@@ -0,0 +1,8 @@
+<div class="container loading-status-element">
+  <div ng-show="hasError && !loading">
+    <span ng-transclude></span>
+  </div>
+  <div ng-show="loading">
+    Loading...
+  </div>
+</div>
diff --git a/static/directives/logs-view.html b/static/directives/logs-view.html
index 0027acc97..0e030e77c 100644
--- a/static/directives/logs-view.html
+++ b/static/directives/logs-view.html
@@ -6,9 +6,9 @@
       <span class="entity-reference" name="performer.username" isrobot="performer.is_robot" ng-show="performer"></span>
       <span id="logs-range" class="mini">
         From
-        <input type="text" class="input-small" name="start" ng-model="logStartDate" data-date-format="mm/dd/yyyy" bs-datepicker/>
+        <input type="text" class="logs-date-picker input-sm" name="start" ng-model="logStartDate" data-date-format="mm/dd/yyyy" bs-datepicker/>
         <span class="add-on">to</span>
-        <input type="text" class="input-small" name="end" ng-model="logEndDate" data-date-format="mm/dd/yyyy" bs-datepicker/>
+        <input type="text" class="logs-date-picker input-sm" name="end" ng-model="logEndDate" data-date-format="mm/dd/yyyy" bs-datepicker/>
       </span>
     </span>
     <span class="right">
@@ -21,7 +21,7 @@
   </div>
   
   <div ng-show="loading">
-    <i class="fa fa-spinner fa-spin fa-3x"></i>
+    <div class="quay-spinner 3x"></div>
   </div>
   <div ng-show="!loading">    
     <div id="bar-chart" style="width: 800px; height: 500px;" ng-show="chartVisible">
diff --git a/static/directives/plan-manager.html b/static/directives/plan-manager.html
index cf7612d0d..dac8fd430 100644
--- a/static/directives/plan-manager.html
+++ b/static/directives/plan-manager.html
@@ -1,6 +1,6 @@
 <div class="plan-manager-element">
   <!-- Loading/Changing -->
-  <i class="fa fa-spinner fa-spin fa-3x" ng-show="planLoading"></i>
+  <div class="quay-spinner 3x" ng-show="planLoading"></div>
 
   <!-- Alerts -->
   <div class="alert alert-danger" ng-show="limit == 'over' && !planLoading">
@@ -32,26 +32,35 @@
       <td></td>
     </thead>
      
-    <tr ng-repeat="plan in plans" ng-class="(subscribedPlan.stripeId === plan.stripeId) ? getActiveSubClass() : ''">
-      <td>{{ plan.title }}</td>
+    <tr ng-repeat="plan in plans" ng-show="isPlanVisible(plan, subscribedPlan)"
+        ng-class="{'active':(subscribedPlan.stripeId === plan.stripeId), 'deprecated-plan':plan.deprecated}">
+      <td>
+        {{ plan.title }}
+        <div class="deprecated-plan-label" ng-show="plan.deprecated">
+          <span class="context-tooltip" title="This plan has been discontinued. As a valued early adopter, you may continue to stay on this plan indefinitely." bs-tooltip="tooltip.title" data-placement="right">Discontinued Plan</span>
+        </div>
+      </td>
       <td>{{ plan.privateRepos }}</td>
       <td><div class="plan-price">${{ plan.price / 100 }}</div></td>
       <td class="controls">
-        <div ng-switch='plan.stripeId'>
-          <div ng-switch-when='bus-free'>
-            <button class="btn button-hidden">Hidden!</button>
+        <div ng-switch='plan.deprecated'>
+          <div ng-switch-when='true'>
+            <button class="btn btn-danger" ng-click="cancelSubscription()">
+              <span class="quay-spinner" ng-show="planChanging"></span>
+              <span ng-show="!planChanging">Cancel</span>
+            </button>
           </div>
           <div ng-switch-default>
             <button class="btn" ng-show="subscribedPlan.stripeId !== plan.stripeId"
                     ng-class="subscribedPlan.price == 0 ? 'btn-primary' : 'btn-default'"
                     ng-click="changeSubscription(plan.stripeId)">
-              <i class="fa fa-spinner fa-spin" ng-show="planChanging"></i>
+              <span class="quay-spinner" ng-show="planChanging"></span>
               <span ng-show="!planChanging && subscribedPlan.price != 0">Change</span>
               <span ng-show="!planChanging && subscribedPlan.price == 0">Subscribe</span>
             </button>
             <button class="btn btn-danger" ng-show="subscription.plan === plan.stripeId && plan.price > 0"
                     ng-click="cancelSubscription()">
-              <i class="fa fa-spinner fa-spin" ng-show="planChanging"></i>
+              <span class="quay-spinner" ng-show="planChanging"></span>
               <span ng-show="!planChanging">Cancel</span>
             </button>
           </div>
diff --git a/static/directives/repo-circle.html b/static/directives/repo-circle.html
index 49d60ce56..336c03fe0 100644
--- a/static/directives/repo-circle.html
+++ b/static/directives/repo-circle.html
@@ -1,2 +1,2 @@
-<i class="fa fa-lock fa-lg" style="{{ repo.is_public ? 'visibility: hidden' : 'visibility: visible' }}" title="Private Repository"></i>
+<i class="fa fa-lock fa-lg" style="{{ repo.is_public ? 'visibility: hidden' : 'visibility: inherit' }}" title="Private Repository"></i>
 <i class="fa fa-hdd"></i>
diff --git a/static/directives/resource-view.html b/static/directives/resource-view.html
new file mode 100644
index 000000000..7763fa52a
--- /dev/null
+++ b/static/directives/resource-view.html
@@ -0,0 +1,11 @@
+<div class="resource-view-element">
+  <div class="resource-spinner" ng-class="resource.loading ? 'visible' : ''">
+    <div class="small-spinner"></div>
+  </div>
+  <div class="resource-error" ng-show="!resource.loading && resource.hasError">
+    {{ errorMessage }}
+  </div>
+  <div class="resource-content" ng-class="(!resource.loading && !resource.hasError) ? 'visible' : ''">
+    <span ng-transclude></span>
+  </div>
+</div>
diff --git a/static/directives/robots-manager.html b/static/directives/robots-manager.html
index c478fbb02..68a2ed08a 100644
--- a/static/directives/robots-manager.html
+++ b/static/directives/robots-manager.html
@@ -1,5 +1,5 @@
 <div class="robots-manager-element">
-  <i class="fa fa-spinner fa-spin fa-3x" ng-show="loading"></i>
+  <div class="quay-spinner" ng-show="loading"></div>
   <div class="alert alert-info">Robot accounts allow for delegating access in multiple repositories to role-based accounts that you manage</div>
 
   <div class="container" ng-show="!loading">
diff --git a/static/directives/signup-form.html b/static/directives/signup-form.html
index b72c7636e..562223d96 100644
--- a/static/directives/signup-form.html
+++ b/static/directives/signup-form.html
@@ -19,7 +19,7 @@
     </div>
   </form>
   <div ng-show="registering" style="text-align: center">
-    <i class="fa fa-spinner fa-spin fa-3x"></i>
+    <div class="quay-spinner 2x"></div>
   </div>
   <div ng-show="awaitingConfirmation">
     <div class="sub-message">
diff --git a/static/directives/spinner.html b/static/directives/spinner.html
new file mode 100644
index 000000000..c0e0eb0e9
--- /dev/null
+++ b/static/directives/spinner.html
@@ -0,0 +1 @@
+<div class="small-spinner"></div>
diff --git a/static/directives/user-setup.html b/static/directives/user-setup.html
index 1e830ec1b..34f2a0b78 100644
--- a/static/directives/user-setup.html
+++ b/static/directives/user-setup.html
@@ -43,7 +43,7 @@
             <button class="btn btn-lg btn-primary btn-block" type="submit">Send Recovery Email</button>
           </form>
           
-          <div class="alert alert-danger" ng-show="invalidEmail">Unable to locate account.</div>
+          <div class="alert alert-danger" ng-show="invalidRecovery">{{errorMessage}}</div>
           
           <div class="alert alert-success" ng-show="sent">Account recovery email was sent.</div>
         </div>
diff --git a/static/img/org-admin.png b/static/img/org-admin.png
index f1a579aa7..149562dd2 100644
Binary files a/static/img/org-admin.png and b/static/img/org-admin.png differ
diff --git a/static/img/org-logs.png b/static/img/org-logs.png
new file mode 100644
index 000000000..6d9a1a56d
Binary files /dev/null and b/static/img/org-logs.png differ
diff --git a/static/img/org-repo-admin.png b/static/img/org-repo-admin.png
index ee19347ff..f7aa665e5 100644
Binary files a/static/img/org-repo-admin.png and b/static/img/org-repo-admin.png differ
diff --git a/static/img/org-repo-list.png b/static/img/org-repo-list.png
index 4416392b9..d0bf0fe1b 100644
Binary files a/static/img/org-repo-list.png and b/static/img/org-repo-list.png differ
diff --git a/static/img/org-teams.png b/static/img/org-teams.png
index 8083c4c0a..5f765b085 100644
Binary files a/static/img/org-teams.png and b/static/img/org-teams.png differ
diff --git a/static/img/repo-admin.png b/static/img/repo-admin.png
index 542717be6..f1fc4334f 100644
Binary files a/static/img/repo-admin.png and b/static/img/repo-admin.png differ
diff --git a/static/img/repo-changes.png b/static/img/repo-changes.png
index fce6855a8..e1490861a 100644
Binary files a/static/img/repo-changes.png and b/static/img/repo-changes.png differ
diff --git a/static/img/repo-view.png b/static/img/repo-view.png
index 72d862430..2fe25651a 100644
Binary files a/static/img/repo-view.png and b/static/img/repo-view.png differ
diff --git a/static/img/user-home.png b/static/img/user-home.png
index cfd392360..8625bfd4e 100644
Binary files a/static/img/user-home.png and b/static/img/user-home.png differ
diff --git a/static/js/app.js b/static/js/app.js
index 3470fb2e8..6e1fb166c 100644
--- a/static/js/app.js
+++ b/static/js/app.js
@@ -1,6 +1,30 @@
 var TEAM_PATTERN = '^[a-zA-Z][a-zA-Z0-9]+$';
 var ROBOT_PATTERN = '^[a-zA-Z][a-zA-Z0-9]+$';
 
+function getRestUrl(args) {
+  var url = '';
+  for (var i = 0; i < arguments.length; ++i) {
+    if (i > 0) {
+       url += '/';
+    }
+    url += encodeURI(arguments[i])
+  }
+  return url;
+}
+
+function clickElement(el){
+  // From: http://stackoverflow.com/questions/16802795/click-not-working-in-mocha-phantomjs-on-certain-elements
+  var ev = document.createEvent("MouseEvent");
+  ev.initMouseEvent(
+    "click",
+     true /* bubble */, true /* cancelable */,
+     window, null,
+     0, 0, 0, 0, /* coordinates */
+     false, false, false, false, /* modifier keys */
+     0 /*left*/, null);
+  el.dispatchEvent(ev);
+}
+
 function getFirstTextLine(commentString) {
   if (!commentString) { return ''; }
       
@@ -34,11 +58,8 @@ function getFirstTextLine(commentString) {
   return '';
 }
 
-function createRobotAccount(Restangular, is_org, orgname, name, callback) {
-  var url = is_org ? getRestUrl('organization', orgname, 'robots', name) :
-      getRestUrl('user/robots', name);
-  var createRobot = Restangular.one(url);
-  createRobot.customPUT().then(callback, function(resp) {
+function createRobotAccount(ApiService, is_org, orgname, name, callback) {
+  ApiService.createRobot(is_org ? orgname : null, null, {'robot_shortname': name}).then(callback, function(resp) {
     bootbox.dialog({
       "message": resp.data ? resp.data : 'The robot account could not be created',
       "title": "Cannot create robot account",
@@ -52,14 +73,18 @@ function createRobotAccount(Restangular, is_org, orgname, name, callback) {
   });
 }
 
-function createOrganizationTeam(Restangular, orgname, teamname, callback) {
-  var createTeam = Restangular.one(getRestUrl('organization', orgname, 'team', teamname));
+function createOrganizationTeam(ApiService, orgname, teamname, callback) {
   var data = {
     'name': teamname,
     'role': 'member'
   };
+
+  var params = {
+    'orgname': orgname,
+    'teamname': teamname
+  };
   
-  createTeam.customPOST(data).then(callback, function() {
+  ApiService.updateOrganizationTeam(data, params).then(callback, function() {
     bootbox.dialog({
       "message": resp.data ? resp.data : 'The team could not be created',
       "title": "Cannot create team",
@@ -73,42 +98,236 @@ function createOrganizationTeam(Restangular, orgname, teamname, callback) {
   });
 }
 
-function getRestUrl(args) {
-  var url = '';
-  for (var i = 0; i < arguments.length; ++i) {
-    if (i > 0) {
-       url += '/';
-    }
-    url += encodeURI(arguments[i])
-  }
-  return url;
-}
-
 function getMarkedDown(string) {
   return Markdown.getSanitizingConverter().makeHtml(string || '');
 }
 
 // Start the application code itself.
-quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'angulartics', 'angulartics.mixpanel', '$strap.directives', 'ngCookies'], function($provide) {
-    $provide.factory('UserService', ['Restangular', '$cookies', function(Restangular, $cookies) {
+quayApp = angular.module('quay', ['ngRoute', 'chieffancypants.loadingBar', 'restangular', 'angularMoment', 'angulartics', /*'angulartics.google.analytics',*/ 'angulartics.mixpanel', '$strap.directives', 'ngCookies', 'ngSanitize'], function($provide, cfpLoadingBarProvider) {
+    cfpLoadingBarProvider.includeSpinner = false;
+
+    $provide.factory('UtilService', ['$sanitize', function($sanitize) {
+      var utilService = {};
+
+      utilService.textToSafeHtml = function(text) {
+        var adjusted = text.replace(/&/g, "&amp;")
+         .replace(/</g, "&lt;")
+         .replace(/>/g, "&gt;")
+         .replace(/"/g, "&quot;")
+         .replace(/'/g, "&#039;");
+
+        return $sanitize(adjusted);
+      };
+
+      return utilService;
+    }]);
+
+    $provide.factory('ImageMetadataService', ['UtilService', function(UtilService) {
+      var metadataService = {};
+      metadataService.getFormattedCommand = function(image) {
+        if (!image || !image.command || !image.command.length) {
+          return '';
+        }
+
+        var getCommandStr = function(command) {
+          // Handle /bin/sh commands specially.
+          if (command.length > 2 && command[0] == '/bin/sh' && command[1] == '-c') {
+            return command[2];
+          }
+          
+          return command.join(' ');
+        };
+
+        return getCommandStr(image.command);
+      };
+
+      metadataService.getEscapedFormattedCommand = function(image) {
+        return UtilService.textToSafeHtml(metadataService.getFormattedCommand(image));
+      };
+
+      return metadataService;
+    }]);
+
+    $provide.factory('ApiService', ['Restangular', function(Restangular) {
+      var apiService = {};
+
+      var getResource = function(path) {
+        var resource = {};
+        resource.url = path;
+        resource.withOptions = function(options) {
+          this.options = options;
+          return this;
+        };
+
+        resource.get = function(processor, opt_errorHandler) {
+          var options = this.options;
+          var performer = Restangular.one(this.url);
+
+          var result = {
+            'loading': true,
+            'value': null,
+            'hasError': false
+          };
+
+          performer.get(options).then(function(resp) {
+            result.value = processor(resp);
+            result.loading = false;
+          }, function(resp) {
+            result.hasError = true;
+            result.loading = false;
+            if (opt_errorHandler) {
+              opt_errorHandler(resp);
+            }
+          });
+
+          return result;
+        };
+
+        return resource;
+      };
+
+      var formatMethodName = function(endpointName) {
+        var formatted = '';
+        for (var i = 0; i < endpointName.length; ++i) {
+          var c = endpointName[i];
+          if (c == '_') {
+            c = endpointName[i + 1].toUpperCase();
+            i++;
+          }
+
+          formatted += c;
+        }
+
+        return formatted;
+      };
+
+      var buildUrl = function(path, parameters) {
+        // We already have /api/ on the URLs, so remove them from the paths.
+        path = path.substr('/api/'.length, path.length);
+
+        var url = '';
+        for (var i = 0; i < path.length; ++i) {
+          var c = path[i];
+          if (c == '<') {
+            var end = path.indexOf('>', i);
+            var varName = path.substr(i + 1, end - i - 1);
+            var colon = varName.indexOf(':');
+            var isPathVar = false;
+            if (colon > 0) {
+              isPathVar = true;
+              varName = varName.substr(colon + 1);
+            }
+
+            if (!parameters[varName]) {
+              throw new Error('Missing parameter: ' + varName);
+            }
+
+            url += isPathVar ? parameters[varName] : encodeURI(parameters[varName]);
+            i = end;
+            continue;
+          }
+
+          url += c;
+        }
+
+        return url;
+      };
+
+      var getGenericMethodName = function(userMethodName) {
+        return formatMethodName(userMethodName.replace('_user', ''));
+      };
+
+      var buildMethodsForEndpoint = function(endpoint) {
+        var method = endpoint.methods[0].toLowerCase();
+        var methodName = formatMethodName(endpoint['name']);
+        apiService[methodName] = function(opt_options, opt_parameters) {
+          return Restangular.one(buildUrl(endpoint['path'], opt_parameters))['custom' + method.toUpperCase()](opt_options);
+        };
+
+        if (method == 'get') {
+          apiService[methodName + 'AsResource'] = function(opt_parameters) {
+            return getResource(buildUrl(endpoint['path'], opt_parameters));
+          };
+        }
+
+        if (endpoint['user_method']) {
+          apiService[getGenericMethodName(endpoint['user_method'])] = function(orgname, opt_options, opt_parameters) {
+            if (orgname) {
+              if (orgname.name) {
+                orgname = orgname.name;
+              }
+
+              var params = jQuery.extend({'orgname' : orgname}, opt_parameters || {});
+              return apiService[methodName](opt_options, params);
+            } else {
+              return apiService[formatMethodName(endpoint['user_method'])](opt_options, opt_parameters);
+            }
+          };
+        }
+      };
+
+      // Construct the methods for each API endpoint.
+      if (!window.__endpoints) {
+        return apiService;
+      }
+
+      for (var i = 0; i < window.__endpoints.length; ++i) {
+        var endpoint = window.__endpoints[i];
+        buildMethodsForEndpoint(endpoint);
+      }
+
+      return apiService;
+    }]);
+    
+    $provide.factory('CookieService', ['$cookies', '$cookieStore', function($cookies, $cookieStore) {
+      var cookieService = {};
+      cookieService.putPermanent = function(name, value) {
+        document.cookie = escape(name) + "=" + escape(value) + "; expires=Fri, 31 Dec 9999 23:59:59 GMT; path=/";
+      };
+
+      cookieService.putSession = function(name, value) {
+        $cookies[name] = value;
+      };
+
+      cookieService.clear = function(name) {
+        $cookies[name] = '';
+      };
+
+      cookieService.get = function(name) {
+        return $cookies[name];
+      };
+
+      return cookieService;
+    }]);
+
+    $provide.factory('UserService', ['ApiService', 'CookieService', function(ApiService, CookieService) {
       var userResponse = {
         verified: false,
         anonymous: true,
         username: null,
         email: null,
         askForPassword: false,
-        organizations: []
+        organizations: [],
+        logins: []
       }
 
       var userService = {}
 
       userService.hasEverLoggedIn = function() {
-        return $cookies.loggedIn == 'true';
+        return CookieService.get('quay.loggedin') == 'true';
+      };
+
+      userService.updateUserIn = function(scope, opt_callback) {
+        scope.$watch(function () { return userService.currentUser(); }, function (currentUser) {
+          scope.user = currentUser;
+          if (opt_callback) {
+            opt_callback(currentUser); 
+          }
+        }, true);
       };
 
       userService.load = function(opt_callback) {
-        var userFetch = Restangular.one('user/');
-        userFetch.get().then(function(loadedUser) {
+        ApiService.getLoggedInUser().then(function(loadedUser) {
           userResponse = loadedUser;
 
           if (!userResponse.anonymous) {
@@ -122,7 +341,17 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
               '$created': new Date()
             })
 
-            $cookies.loggedIn = 'true';
+            if (window.olark !== undefined) {
+              olark('api.visitor.getDetails', function(details) {
+                if (details.fullName === null) {
+                  olark('api.visitor.updateFullName', {fullName: userResponse.username});
+                }
+              });
+              olark('api.visitor.updateEmailAddress', {emailAddress: userResponse.email});
+              olark('api.chat.updateVisitorStatus', {snippet: 'username: ' + userResponse.username});
+            }
+
+            CookieService.putPermanent('quay.loggedin', 'true');
           }
 
           if (opt_callback) {
@@ -172,21 +401,27 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
       if ($location.host() === 'quay.io') {
         keyService['stripePublishableKey'] = 'pk_live_P5wLU0vGdHnZGyKnXlFG4oiu';
         keyService['githubClientId'] = '5a8c08b06c48d89d4d1e';
+        keyService['githubRedirectUri'] = 'https://quay.io/oauth2/github/callback';
       } else {        
         keyService['stripePublishableKey'] = 'pk_test_uEDHANKm9CHCvVa2DLcipGRh';
         keyService['githubClientId'] = 'cfbc4aca88e5c1b40679';
+        keyService['githubRedirectUri'] = 'http://localhost:5000/oauth2/github/callback';
       }
 
       return keyService;
     }]);
 
-    $provide.factory('PlanService', ['Restangular', 'KeyService', 'UserService', '$cookieStore',
-        function(Restangular, KeyService, UserService, $cookieStore) {
+    $provide.factory('PlanService', ['KeyService', 'UserService', 'CookieService', 'ApiService',
+        function(KeyService, UserService, CookieService, ApiService) {
       var plans = null;
       var planDict = {};
       var planService = {};
       var listeners = [];
 
+      planService.getFreePlan = function() {
+        return 'free';
+      };
+
       planService.registerListener = function(obj, callback) {
         listeners.push({'obj': obj, 'callback': callback});
       };
@@ -201,7 +436,28 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
       };
 
       planService.notePlan = function(planId) {
-        $cookieStore.put('quay.notedplan', planId);
+        CookieService.putSession('quay.notedplan', planId);
+      };
+
+      planService.isOrgCompatible = function(plan) {
+        return plan['stripeId'] == planService.getFreePlan() || plan['bus_features'];
+      };
+
+      planService.getMatchingBusinessPlan = function(callback) {
+        planService.getPlans(function() {
+          planService.getSubscription(null, function(sub) {
+            var plan = planDict[sub.plan];
+            if (!plan) {
+              planService.getMinimumPlan(0, true, callback);
+              return;
+            }
+
+            var count = Math.max(sub.usedPrivateRepos, plan.privateRepos);
+            planService.getMinimumPlan(count, true, callback);
+          }, function() {
+            planService.getMinimumPlan(0, true, callback);
+          });
+        });
       };
 
       planService.handleNotedPlan = function() {
@@ -212,9 +468,9 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
           if (UserService.currentUser().anonymous) {
             return;
           }
-        
-          planService.isBusinessPlan(planId, function(bus) {
-            if (bus) {
+
+          planService.getPlan(planId, function(plan) {
+            if (planService.isOrgCompatible(plan)) {
               document.location = '/organizations/new/?plan=' + planId;
             } else {
               document.location = '/user?plan=' + planId;
@@ -224,8 +480,8 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
       };
 
       planService.getAndResetNotedPlan = function() {
-        var planId = $cookieStore.get('quay.notedplan');
-        $cookieStore.put('quay.notedplan', '');
+        var planId = CookieService.get('quay.notedplan');
+        CookieService.clear('quay.notedplan');
         return planId;
       };
       
@@ -254,72 +510,53 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
           return;
         }
 
-        var getPlans = Restangular.one('plans');
-        getPlans.get().then(function(data) {
+        ApiService.listPlans().then(function(data) {
           var i = 0;
-          for(i = 0; i < data.user.length; i++) {
-            planDict[data.user[i].stripeId] = data.user[i];
+          for(i = 0; i < data.plans.length; i++) {
+            planDict[data.plans[i].stripeId] = data.plans[i];
           }
-          for(i = 0; i < data.business.length; i++) {
-            planDict[data.business[i].stripeId] = data.business[i];
-          }
-          plans = data;
+          plans = data.plans;
           callback(plans);
         }, function() { callback([]); });
       };
 
-      planService.getMatchingBusinessPlan = function(callback) {
-        planService.getPlans(function() {
-          planService.getSubscription(null, function(sub) {
-            var plan = planDict[sub.plan];
-            if (!plan) {
-              planService.getMinimumPlan(0, true, callback);
-              return;
-            }
-
-            var count = Math.max(sub.usedPrivateRepos, plan.privateRepos);
-            planService.getMinimumPlan(count, true, callback);
-          }, function() {
-            planService.getMinimumPlan(0, true, callback);
-          });
-        });
-      };
-
-      planService.isBusinessPlan = function(planId, callback) {
+      planService.getPlans = function(callback, opt_includePersonal) {
         planService.verifyLoaded(function() {
-          planSource = plans.business;
-          for (var i = 0; i < planSource.length; i++) {
-            var plan = planSource[i];
-            if (plan.stripeId == planId) {
-              callback(true);
-              return;
-            }
+          var filtered = [];
+          for (var i = 0; i < plans.length; ++i) {
+            var plan = plans[i];
+            if (plan['deprecated']) { continue; }
+            if (!opt_includePersonal && !planService.isOrgCompatible(plan)) { continue; }
+            filtered.push(plan);
           }
-          callback(false);
+          callback(filtered);
         });
       };
 
-      planService.getPlans = function(callback) {
-        planService.verifyLoaded(callback);
-      };
-
       planService.getPlan = function(planId, callback) {
+        planService.getPlanIncludingDeprecated(planId, function(plan) {
+          if (!plan['deprecated']) {
+            callback(plan);
+          }
+        });
+      };
+
+      planService.getPlanIncludingDeprecated = function(planId, callback) {
         planService.verifyLoaded(function() {
-          if (planDict[planId]) {
+          if (planDict[planId]) {            
             callback(planDict[planId]);
           }
         });
       };
 
       planService.getMinimumPlan = function(privateCount, isBusiness, callback) {
-        planService.verifyLoaded(function() {
-          var planSource = plans.user;
-          if (isBusiness) {
-            planSource = plans.business;
-          }
+        planService.getPlans(function(plans) {          
+          for (var i = 0; i < plans.length; i++) {
+            var plan = plans[i];
+            if (isBusiness && !planService.isOrgCompatible(plan)) {
+              continue;
+            }
 
-          for (var i = 0; i < planSource.length; i++) {
-            var plan = planSource[i];
             if (plan.privateRepos >= privateCount) {
               callback(plan);
               return;
@@ -331,13 +568,7 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
       };
 
       planService.getSubscription = function(orgname, success, failure) {
-        var url = planService.getSubscriptionUrl(orgname);
-        var getSubscription = Restangular.one(url);
-        getSubscription.get().then(success, failure);
-      };
-
-      planService.getSubscriptionUrl = function(orgname) {
-        return orgname ? getRestUrl('organization', orgname, 'plan') : 'user/plan';
+         ApiService.getSubscription(orgname).then(success, failure);
       };
 
       planService.setSubscription = function(orgname, planId, success, failure, opt_token) {
@@ -349,9 +580,7 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
           subscriptionDetails['token'] = opt_token.id;
         }
 
-        var url = planService.getSubscriptionUrl(orgname);
-        var createSubscriptionRequest = Restangular.one(url);
-        createSubscriptionRequest.customPUT(subscriptionDetails).then(function(resp) {
+        ApiService.updateSubscription(orgname, subscriptionDetails).then(function(resp) {
           success(resp);
           planService.getPlan(planId, function(plan) {
             for (var i = 0; i < listeners.length; ++i) {
@@ -362,9 +591,7 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
       };
 
       planService.getCardInfo = function(orgname, callback) {
-        var url = orgname ? getRestUrl('organization', orgname, 'card') : 'user/card';       
-        var getCard = Restangular.one(url);
-        getCard.customGET().then(function(resp) {
+        ApiService.getCard(orgname).then(function(resp) {
           callback(resp.card);
         }, function() {
           callback({'is_valid': false});
@@ -377,6 +604,8 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
         }
 
         planService.getPlan(planId, function(plan) {
+          if (orgname && !planService.isOrgCompatible(plan)) { return; }
+
           planService.getCardInfo(orgname, function(cardInfo) {
             if (plan.price > 0 && !cardInfo.last4) {
               planService.showSubscribeDialog($scope, orgname, planId, callbacks);
@@ -409,12 +638,10 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
               'token': token.id
             };
 
-            var url = orgname ? getRestUrl('organization', orgname, 'card') : 'user/card';
-            var changeCardRequest = Restangular.one(url);
-              changeCardRequest.customPOST(cardInfo).then(callbacks['success'], function(resp) {
-                planService.handleCardError(resp);
-                callbacks['failure'](resp);
-              });
+            ApiService.setCard(orgname, cardInfo).then(callbacks['success'], function(resp) {
+              planService.handleCardError(resp);
+              callbacks['failure'](resp);
+            });
           });
         };
 
@@ -533,11 +760,11 @@ quayApp = angular.module('quay', ['ngRoute', 'restangular', 'angularMoment', 'an
     // WARNING WARNING WARNING
     $routeProvider.
       when('/repository/:namespace/:name', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl,
-                                            fixFooter: true, reloadOnSearch: false}).
+                                            fixFooter: false, reloadOnSearch: false}).
       when('/repository/:namespace/:name/tag/:tag', {templateUrl: '/static/partials/view-repo.html', controller: RepoCtrl,
-                                                     fixFooter: true}).
-      when('/repository/:namespace/:name/image/:image', {templateUrl: '/static/partials/image-view.html', controller: ImageViewCtrl}).
-            when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl, reloadOnSearch: false}).
+                                                     fixFooter: false}).
+      when('/repository/:namespace/:name/image/:image', {templateUrl: '/static/partials/image-view.html', controller: ImageViewCtrl, reloadOnSearch: false}).
+      when('/repository/:namespace/:name/admin', {templateUrl: '/static/partials/repo-admin.html', controller:RepoAdminCtrl, reloadOnSearch: false}).
       when('/repository/', {title: 'Repositories', description: 'Public and private docker repositories list',
                             templateUrl: '/static/partials/repo-list.html', controller: RepoListCtrl}).
       when('/user/', {title: 'Account Settings', description:'Account settings for Quay.io', templateUrl: '/static/partials/user-admin.html',
@@ -658,14 +885,15 @@ quayApp.directive('userSetup', function () {
       'signInStarted': '&signInStarted',
       'signedIn': '&signedIn'
     },
-    controller: function($scope, $location, $timeout, Restangular, KeyService, UserService) {
+    controller: function($scope, $location, $timeout, ApiService, KeyService, UserService) {
       $scope.sendRecovery = function() {
-        var signinPost = Restangular.one('recovery');
-        signinPost.customPOST($scope.recovery).then(function() {
-          $scope.invalidEmail = false;
+        ApiService.requestRecoveryEmail($scope.recovery).then(function() {
+          $scope.invalidRecovery = false;
+          $scope.errorMessage = '';
           $scope.sent = true;
         }, function(result) {
-          $scope.invalidEmail = true;
+          $scope.invalidRecovery = true;
+          $scope.errorMessage = result.data;
           $scope.sent = false;
         });
       };
@@ -691,7 +919,7 @@ quayApp.directive('signinForm', function () {
       'signInStarted': '&signInStarted',
       'signedIn': '&signedIn'
     },
-    controller: function($scope, $location, $timeout, Restangular, KeyService, UserService) {
+    controller: function($scope, $location, $timeout, ApiService, KeyService, UserService) {
       $scope.showGithub = function() {
         $scope.markStarted();
 
@@ -718,8 +946,7 @@ quayApp.directive('signinForm', function () {
       $scope.signin = function() {
         $scope.markStarted();
 
-        var signinPost = Restangular.one('signin');
-        signinPost.customPOST($scope.user).then(function() {
+        ApiService.signinUser($scope.user).then(function() {
           $scope.needsEmailVerification = false;
           $scope.invalidCredentials = false;
 
@@ -759,7 +986,7 @@ quayApp.directive('signupForm', function () {
     scope: {
 
     },
-    controller: function($scope, $location, $timeout, Restangular, KeyService, UserService) {      
+    controller: function($scope, $location, $timeout, ApiService, KeyService, UserService) {      
       $('.form-signup').popover();
 
       angulartics.waitForVendorApi(mixpanel, 500, function(loadedMixpanel) {
@@ -776,8 +1003,7 @@ quayApp.directive('signupForm', function () {
         $('.form-signup').popover('hide');
         $scope.registering = true;
 
-        var newUserPost = Restangular.one('user/');
-        newUserPost.customPOST($scope.newUser).then(function() {
+        ApiService.createNewUser($scope.newUser).then(function() {
           $scope.awaitingConfirmation = true;
           $scope.registering  = false;
 
@@ -830,7 +1056,7 @@ quayApp.directive('dockerAuthDialog', function () {
       'shown': '=shown',
       'counter': '=counter'
     },
-    controller: function($scope, $element, Restangular) {     
+    controller: function($scope, $element) {     
       $scope.isDownloadSupported = function() {
         try { return !!new Blob(); } catch(e){}
         return false;
@@ -870,6 +1096,17 @@ quayApp.directive('dockerAuthDialog', function () {
 });
 
 
+quayApp.filter('bytes', function() {
+  return function(bytes, precision) {
+    if (!bytes || isNaN(parseFloat(bytes)) || !isFinite(bytes)) return 'Unknown';
+    if (typeof precision === 'undefined') precision = 1;
+    var units = ['bytes', 'kB', 'MB', 'GB', 'TB', 'PB'],
+    number = Math.floor(Math.log(bytes) / Math.log(1024));
+    return (bytes / Math.pow(1024, Math.floor(number))).toFixed(precision) + ' ' + units[number];
+  }
+});
+
+
 quayApp.filter('visibleLogFilter', function () {
   return function (logs, allowed) {
     if (!allowed) {
@@ -888,6 +1125,53 @@ quayApp.filter('visibleLogFilter', function () {
 });
 
 
+quayApp.directive('billingInvoices', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/billing-invoices.html',
+    replace: false,
+    transclude: false,
+    restrict: 'C',
+    scope: {
+      'organization': '=organization',
+      'user': '=user',
+      'visible': '=visible'
+    },
+    controller: function($scope, $element, $sce, ApiService) {
+      $scope.loading = false;
+      $scope.invoiceExpanded = {};
+
+      $scope.toggleInvoice = function(id) {
+        $scope.invoiceExpanded[id] = !$scope.invoiceExpanded[id];
+      };
+
+      var update = function() {
+        var hasValidUser = !!$scope.user;
+        var hasValidOrg = !!$scope.organization;
+        var isValid = hasValidUser || hasValidOrg;
+
+        if (!$scope.visible || !isValid) {
+          return;
+        }
+        
+        $scope.loading = true;
+
+        ApiService.listInvoices($scope.organization).then(function(resp) {
+          $scope.invoices = resp.invoices;
+          $scope.loading = false;
+        });
+      };
+
+      $scope.$watch('organization', update);
+      $scope.$watch('user', update);
+      $scope.$watch('visible', update);
+    }
+  };
+
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('logsView', function () {
   var directiveDefinitionObject = {
     priority: 0,
@@ -902,7 +1186,7 @@ quayApp.directive('logsView', function () {
       'repository': '=repository',
       'performer': '=performer'
     },
-    controller: function($scope, $element, $sce, Restangular) {
+    controller: function($scope, $element, $sce, Restangular, ApiService) {
       $scope.loading = true;
       $scope.logs = null;
       $scope.kindsAllowed = null;
@@ -1018,6 +1302,8 @@ quayApp.directive('logsView', function () {
 
         $scope.loading = true;
 
+        // Note: We construct the URLs here manually because we also use it for the download
+        // path.
         var url = getRestUrl('user/logs');
         if ($scope.organization) {
           url = getRestUrl('organization', $scope.organization.name, 'logs');
@@ -1072,18 +1358,17 @@ quayApp.directive('logsView', function () {
           'robot': 'wrench'
         };
 
-        if (log.ip) {
-          log.metadata['_ip'] = log.ip;
-        }
+        log.metadata['_ip'] = log.ip ? log.ip : null;
 
-        var description = logDescriptions[log.kind] || logTitles[log.kind] || log.kind;
+        var description = logDescriptions[log.kind] || log.kind;
         if (typeof description != 'string') {
           description = description(log.metadata);
         }
           
         for (var key in log.metadata) {
           if (log.metadata.hasOwnProperty(key)) {
-            var markedDown = getMarkedDown(log.metadata[key].toString());
+            var value = log.metadata[key] != null ? log.metadata[key].toString() : '(Unknown)';
+            var markedDown = getMarkedDown(value);
             markedDown = markedDown.substr('<p>'.length, markedDown.length - '<p></p>'.length);
 
             var icon = fieldIcons[key];
@@ -1121,7 +1406,7 @@ quayApp.directive('robotsManager', function () {
       'organization': '=organization',
       'user': '=user'
     },
-    controller: function($scope, $element, Restangular) {
+    controller: function($scope, $element, ApiService) {
       $scope.ROBOT_PATTERN = ROBOT_PATTERN;
       $scope.robots = null;
       $scope.loading = false;
@@ -1146,7 +1431,7 @@ quayApp.directive('robotsManager', function () {
       $scope.createRobot = function(name) {
         if (!name) { return; }
 
-        createRobotAccount(Restangular, !!$scope.organization, $scope.organization ? $scope.organization.name : '', name,
+        createRobotAccount(ApiService, !!$scope.organization, $scope.organization ? $scope.organization.name : '', name,
           function(created) {
             $scope.robots.push(created);
           });
@@ -1154,11 +1439,7 @@ quayApp.directive('robotsManager', function () {
 
       $scope.deleteRobot = function(info) {
         var shortName = $scope.getShortenedName(info.name);
-        var url = $scope.organization ? getRestUrl('organization', $scope.organization.name, 'robots', shortName) :
-              getRestUrl('user/robots', shortName);
-
-        var deleteRobot = Restangular.one(url);
-        deleteRobot.customDELETE().then(function(resp) {
+        ApiService.deleteRobot($scope.organization, null, {'robot_shortname': shortName}).then(function(resp) {
           for (var i = 0; i < $scope.robots.length; ++i) {
             if ($scope.robots[i].name == info.name) {
               $scope.robots.splice(i, 1);
@@ -1184,9 +1465,7 @@ quayApp.directive('robotsManager', function () {
         if ($scope.loading) { return; }
 
         $scope.loading = true;
-        var url = $scope.organization ? getRestUrl('organization', $scope.organization.name, 'robots') : 'user/robots';
-        var getRobots = Restangular.one(url);
-        getRobots.customGET($scope.obj).then(function(resp) {
+        ApiService.getRobots($scope.organization).then(function(resp) {
           $scope.robots = resp.robots;
           $scope.loading = false;
         });
@@ -1247,6 +1526,39 @@ quayApp.directive('popupInputButton', function () {
 });
 
 
+quayApp.directive('resourceView', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/resource-view.html',
+    replace: false,
+    transclude: true,
+    restrict: 'C',
+    scope: {
+      'resource': '=resource',
+      'errorMessage': '=errorMessage'
+    },
+    controller: function($scope, $element) {
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
+quayApp.directive('quaySpinner', function () {
+  var directiveDefinitionObject = {
+    priority: 0,
+    templateUrl: '/static/directives/spinner.html',
+    replace: false,
+    transclude: true,
+    restrict: 'C',
+    scope: {},
+    controller: function($scope, $element) {
+    }
+  };
+  return directiveDefinitionObject;
+});
+
+
 quayApp.directive('organizationHeader', function () {
   var directiveDefinitionObject = {
     priority: 0,
@@ -1386,16 +1698,30 @@ quayApp.directive('headerBar', function () {
     restrict: 'C',
     scope: {
     },
-    controller: function($scope, $element, $location, UserService, Restangular) {
-      $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-        $scope.user = currentUser;
-      }, true);
+    controller: function($scope, $element, $location, UserService, PlanService, ApiService) {
+      $scope.overPlan = false;
+
+      var checkOverPlan = function() {
+        if ($scope.user.anonymous) {
+          $scope.overPlan = false;
+          return;
+        }
+
+        ApiService.getUserPrivateCount().then(function(resp) {
+          $scope.overPlan = resp.privateCount > resp.reposAllowed;
+        });
+      };
+      
+      // Monitor any user changes and place the current user into the scope.
+      UserService.updateUserIn($scope, checkOverPlan);
+     
+      // Monitor any plan changes.
+      PlanService.registerListener(this, checkOverPlan);
         
       $scope.signout = function() {
-        var signoutPost = Restangular.one('signout');
-        signoutPost.customPOST().then(function() {
-            UserService.load();
-            $location.path('/');
+        ApiService.logout().then(function() {
+          UserService.load();
+          $location.path('/');
         });
       };
         
@@ -1404,7 +1730,7 @@ quayApp.directive('headerBar', function () {
             return "_self";
         }
         return "";
-      };
+      };     
     }
   };
   return directiveDefinitionObject;
@@ -1426,7 +1752,7 @@ quayApp.directive('entitySearch', function () {
       'includeTeams': '=includeTeams',
       'isOrganization': '=isOrganization'
     },
-    controller: function($scope, $element, Restangular, UserService) {
+    controller: function($scope, $element, Restangular, UserService, ApiService) {
       $scope.lazyLoading = true;
       $scope.isAdmin = false;
 
@@ -1436,16 +1762,12 @@ quayApp.directive('entitySearch', function () {
         $scope.isAdmin = UserService.isNamespaceAdmin($scope.namespace);
 
         if ($scope.isOrganization && $scope.includeTeams) {
-          var url = getRestUrl('organization', $scope.namespace);
-          var getOrganization = Restangular.one(url);
-          getOrganization.customGET().then(function(resp) {
+          ApiService.getOrganization(null, {'orgname': $scope.namespace}).then(function(resp) {
             $scope.teams = resp.teams;
           });
         }
 
-        var url = $scope.isOrganization ? getRestUrl('organization', $scope.namespace, 'robots') : 'user/robots';
-        var getRobots = Restangular.one(url);
-        getRobots.customGET().then(function(resp) {
+        ApiService.getRobots($scope.isOrganization ? $scope.namespace : null).then(function(resp) {
           $scope.robots = resp.robots;
           $scope.lazyLoading = false;
         }, function() {
@@ -1465,7 +1787,7 @@ quayApp.directive('entitySearch', function () {
             return;
           }
 
-          createOrganizationTeam(Restangular, $scope.namespace, teamname, function(created) {
+          createOrganizationTeam(ApiService, $scope.namespace, teamname, function(created) {
             $scope.setEntity(created.name, 'team', false);
             $scope.teams[teamname] = created;
           });          
@@ -1484,7 +1806,7 @@ quayApp.directive('entitySearch', function () {
             return;
           }
 
-          createRobotAccount(Restangular, $scope.isOrganization, $scope.namespace, robotname, function(created) {
+          createRobotAccount(ApiService, $scope.isOrganization, $scope.namespace, robotname, function(created) {
             $scope.setEntity(created.name, 'user', true);
             $scope.robots.push(created);
           });          
@@ -1510,18 +1832,18 @@ quayApp.directive('entitySearch', function () {
       number++;
 
       var input = $element[0].firstChild.firstChild;
-      $scope.namespace = $scope.namespace || '';
       $(input).typeahead({
         name: 'entities' + number,
         remote: {
           url: '/api/entities/%QUERY',
           replace: function (url, uriEncodedQuery) {
-              url = url.replace('%QUERY', uriEncodedQuery);
-              url += '?namespace=' + encodeURIComponent($scope.namespace);
-              if ($scope.includeTeams) {
-                url += '&includeTeams=true'
-              }
-              return url;
+            var namespace = $scope.namespace || '';
+            url = url.replace('%QUERY', uriEncodedQuery);
+            url += '?namespace=' + encodeURIComponent(namespace);
+            if ($scope.includeTeams) {
+              url += '&includeTeams=true'
+            }
+            return url;
           },
           filter: function(data) {
             var datums = [];
@@ -1547,8 +1869,8 @@ quayApp.directive('entitySearch', function () {
           }
           template += '<span class="name">' + datum.value + '</span>';
 
-          if (datum.entity.is_org_member !== undefined && !datum.entity.is_org_member && datum.kind == 'user') {
-            template += '<div class="alert-warning warning">This user is outside your organization</div>';
+          if (datum.entity.is_org_member === false && datum.entity.kind == 'user') {
+            template += '<i class="fa fa-exclamation-triangle" title="User is outside the organization"></i>';
           }
 
           template += '</div>';
@@ -1610,7 +1932,7 @@ quayApp.directive('billingOptions', function () {
       'user': '=user',
       'organization': '=organization'
     },
-    controller: function($scope, $element, PlanService, Restangular) {
+    controller: function($scope, $element, PlanService, ApiService) {
       $scope.invoice_email = false;
       $scope.currentCard = null;
 
@@ -1680,9 +2002,7 @@ quayApp.directive('billingOptions', function () {
 
       var save = function() {
         $scope.working = true;
-        var url = $scope.organization ? getRestUrl('organization', $scope.organization.name) : 'user/';
-        var conductSave = Restangular.one(url);
-        conductSave.customPUT($scope.obj).then(function(resp) {
+        ApiService.changeDetails($scope.organization, $scope.obj).then(function(resp) {
           $scope.working = false;
         });
       };
@@ -1717,11 +2037,19 @@ quayApp.directive('planManager', function () {
       'readyForPlan': '&readyForPlan',
       'planChanged': '&planChanged'
     },
-    controller: function($scope, $element, PlanService, Restangular) {
+    controller: function($scope, $element, PlanService, ApiService) {
       var hasSubscription = false;
         
-      $scope.getActiveSubClass = function() {
-        return 'active';
+      $scope.isPlanVisible = function(plan, subscribedPlan) {
+        if (plan['deprecated']) {
+          return plan == subscribedPlan;
+        }
+
+        if ($scope.organization && !PlanService.isOrgCompatible(plan)) {
+          return false;
+        }
+
+        return true;
       };
 
       $scope.changeSubscription = function(planId) {
@@ -1742,17 +2070,17 @@ quayApp.directive('planManager', function () {
       };
 
       $scope.cancelSubscription = function() {
-        $scope.changeSubscription(getFreePlan());
+        $scope.changeSubscription(PlanService.getFreePlan());
       };
 
       var subscribedToPlan = function(sub) {
         $scope.subscription = sub;
 
-        if (sub.plan != getFreePlan()) {
+        if (sub.plan != PlanService.getFreePlan()) {
           hasSubscription = true;
         }
 
-        PlanService.getPlan(sub.plan, function(subscribedPlan) {
+        PlanService.getPlanIncludingDeprecated(sub.plan, function(subscribedPlan) {
           $scope.subscribedPlan = subscribedPlan;
           $scope.planUsagePercent = sub.usedPrivateRepos * 100 / $scope.subscribedPlan.privateRepos;
           
@@ -1782,22 +2110,13 @@ quayApp.directive('planManager', function () {
         });
       };
 
-      var getFreePlan = function() {
-        for (var i = 0; i < $scope.plans.length; ++i) {
-          if ($scope.plans[i].price == 0) {
-            return $scope.plans[i].stripeId;
-          }
-        }
-        return 'free';
-      };
-
       var update = function() {
         $scope.planLoading = true;
         if (!$scope.plans) { return; }
 
         PlanService.getSubscription($scope.organization, subscribedToPlan, function() {
           // User/Organization has no subscription.
-          subscribedToPlan({ 'plan': getFreePlan() });
+          subscribedToPlan({ 'plan': PlanService.getFreePlan() });
         });
       };
 
@@ -1806,13 +2125,13 @@ quayApp.directive('planManager', function () {
         if (!$scope.user && !$scope.organization) { return; }
 
         $scope.loadingPlans = true;
-        PlanService.getPlans(function(plans) {
-          $scope.plans = plans[$scope.organization ? 'business' : 'user'];
+        PlanService.verifyLoaded(function(plans) {
+          $scope.plans = plans;
           update();
             
           if ($scope.readyForPlan) {
             var planRequested = $scope.readyForPlan();
-            if (planRequested && planRequested != getFreePlan()) {
+            if (planRequested && planRequested != PlanService.getFreePlan()) {
               $scope.changeSubscription(planRequested);
             }
           }
@@ -1844,7 +2163,7 @@ quayApp.directive('namespaceSelector', function () {
       'namespace': '=namespace',
       'requireCreate': '=requireCreate'
     },
-    controller: function($scope, $element, $routeParams, $cookieStore) {
+    controller: function($scope, $element, $routeParams, CookieService) {
       $scope.namespaces = {};
 
       $scope.initialize = function(user) {
@@ -1856,7 +2175,7 @@ quayApp.directive('namespaceSelector', function () {
           }
         }
 
-        var initialNamespace = $routeParams['namespace'] || $cookieStore.get('quay.currentnamespace') || $scope.user.username;
+        var initialNamespace = $routeParams['namespace'] || CookieService.get('quay.namespace') || $scope.user.username;
         $scope.namespaces = namespaces;
         $scope.setNamespace($scope.namespaces[initialNamespace]);
       };
@@ -1873,7 +2192,10 @@ quayApp.directive('namespaceSelector', function () {
         var newNamespace = namespaceObj.name || namespaceObj.username;       
         $scope.namespaceObj = namespaceObj;
         $scope.namespace = newNamespace;
-        $cookieStore.put('quay.currentnamespace', newNamespace);
+
+        if (newNamespace) {
+          CookieService.putPermanent('quay.namespace', newNamespace);
+        }
       };
 
       $scope.$watch('user', function(user) {
@@ -1904,8 +2226,7 @@ quayApp.directive('buildStatus', function () {
                 break;
                 
               case 'pushing':
-                var imagePercentDecimal = (buildInfo.image_completion_percent / 100);
-                return ((buildInfo.current_image + imagePercentDecimal) / buildInfo.total_images) * 100;
+                return buildInfo.push_completion * 100;
                 break;
 
               case 'complete':
@@ -1961,8 +2282,8 @@ quayApp.directive('ngBlur', function() {
   };
 });
 
-quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanService', '$http', '$cookieStore', '$timeout',
-    function($location, $rootScope, Restangular, UserService, PlanService, $http, $cookieStore, $timeout) {
+quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanService', '$http', '$timeout',
+    function($location, $rootScope, Restangular, UserService, PlanService, $http, $timeout) {
   // Handle session expiration.
   Restangular.setErrorInterceptor(function(response) {
     if (response.status == 401) {
@@ -1976,22 +2297,34 @@ quayApp.run(['$location', '$rootScope', 'Restangular', 'UserService', 'PlanServi
   // Check if we need to redirect based on a previously chosen plan.
   PlanService.handleNotedPlan();
 
-  var changeTab = function(activeTab) {
+  var changeTab = function(activeTab, opt_timeout) {
+    var checkCount = 0;
+
     $timeout(function() {
+      if (checkCount > 5) { return; }
+      checkCount++;
+
       $('a[data-toggle="tab"]').each(function(index) {
         var tabName = this.getAttribute('data-target').substr(1);
-        if (tabName == activeTab) {
-          this.click();
+        if (tabName != activeTab) {
+          return;
         }
+
+        if (this.clientWidth == 0) {
+          changeTab(activeTab, 500);
+          return;
+        }
+
+        clickElement(this);
       });
-    });
+    }, opt_timeout);
   };
 
   var resetDefaultTab = function() {
     $timeout(function() {
       $('a[data-toggle="tab"]').each(function(index) {
         if (index == 0) {
-          this.click();
+          clickElement(this);
         }
       });
     });
diff --git a/static/js/bootstrap.js b/static/js/bootstrap.js
new file mode 100644
index 000000000..4293c6651
--- /dev/null
+++ b/static/js/bootstrap.js
@@ -0,0 +1,13 @@
+ $.ajax({
+    type: 'GET',
+    async: false,
+    url:  '/api/discovery',
+    success: function(data) {
+      window.__endpoints = data.endpoints;
+    },
+    error: function() {
+      setTimeout(function() {
+        $('#couldnotloadModal').modal({});
+      }, 250);
+    }
+ });
\ No newline at end of file
diff --git a/static/js/controllers.js b/static/js/controllers.js
index c4611fdbf..d79bbdfb5 100644
--- a/static/js/controllers.js
+++ b/static/js/controllers.js
@@ -15,41 +15,28 @@ $.fn.clipboardCopy = function() {
   });
 };
 
-function SigninCtrl($scope, $location, $timeout, Restangular, KeyService, UserService) {
+function SigninCtrl($scope) {
 };
 
 function PlansCtrl($scope, $location, UserService, PlanService) {
   // Load the list of plans.
   PlanService.getPlans(function(plans) {
     $scope.plans = plans;
-  });
+  }, /* include the personal plan */ true);
 
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-  }, true);
+  // Monitor any user changes and place the current user into the scope.
+  UserService.updateUserIn($scope);
 
   $scope.signedIn = function() {
     $('#signinModal').modal('hide');
     PlanService.handleNotedPlan();    
   };
-
-  $scope.cancelNotedPlan = function() {
-  };
     
   $scope.buyNow = function(plan) {
+    PlanService.notePlan(plan);
     if ($scope.user && !$scope.user.anonymous) {
-      document.location = '/user?plan=' + plan;
+      PlanService.handleNotedPlan();    
     } else {
-      PlanService.notePlan(plan);
-      $('#signinModal').modal({});
-    }
-  };
-
-  $scope.createOrg = function(plan) {
-    if ($scope.user && !$scope.user.anonymous) {
-      document.location = '/organizations/new/?plan=' + plan;
-    } else {
-      PlanService.notePlan(plan);
       $('#signinModal').modal({});
     }
   };
@@ -64,61 +51,81 @@ function SecurityCtrl($scope) {
 function ContactCtrl($scope) {
 }
 
-function RepoListCtrl($scope, Restangular, UserService) {
+function RepoListCtrl($scope, $sanitize, Restangular, UserService, ApiService) {
   $scope.namespace = null;
+  $scope.page = 1;
+  $scope.publicPageCount = null;
+ 
+  // Monitor changes in the user.
+  UserService.updateUserIn($scope, function() {
+    loadMyRepos($scope.namespace);
+  });
 
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-  }, true);
-
+  // Monitor changes in the namespace.
   $scope.$watch('namespace', function(namespace) {
     loadMyRepos(namespace);
   });
 
-  $scope.loading = true;
-  $scope.public_repositories = null;
-  $scope.user_repositories = [];
+  $scope.movePublicPage = function(increment) {
+    if ($scope.publicPageCount == null) {
+      return;
+    }
+
+    $scope.page += increment;
+    if ($scope.page < 1) {
+      $scope.page = 1;
+    }
+
+    if ($scope.page > $scope.publicPageCount) {
+      $scope.page = $scope.publicPageCount;
+    }
+
+    loadPublicRepos();
+  };
 
   var loadMyRepos = function(namespace) {
     if (!$scope.user || $scope.user.anonymous || !namespace) {
       return;
     }
 
-    $scope.loadingmyrepos = true;
-
-    // Load the list of repositories.
-    var params = {
-      'public': false,
-      'sort': true,
-      'namespace': namespace
-    };
-
-    var repositoryFetch = Restangular.all('repository/');
-    repositoryFetch.getList(params).then(function(resp) {
-      $scope.user_repositories = resp.repositories;
-      $scope.loading = !($scope.public_repositories && $scope.user_repositories);
+    var options = {'public': false, 'sort': true, 'namespace': namespace};
+    
+    $scope.user_repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
+      return resp.repositories;
     });
   };
 
-  // Load the list of public repositories.
-  var options = {'public': true, 'private': false, 'sort': true, 'limit': 10};
-  var repositoryPublicFetch = Restangular.all('repository/');
-    repositoryPublicFetch.getList(options).then(function(resp) {
-    $scope.public_repositories = resp.repositories;
-    $scope.loading = !($scope.public_repositories && $scope.user_repositories);
-  });
+  var loadPublicRepos = function() {
+    var options = {
+      'public': true,
+      'private': false,
+      'sort': true,
+      'limit': 10,
+      'page': $scope.page,
+      'count': $scope.page == 1
+    };
+
+    $scope.public_repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
+      if (resp.count) {
+        $scope.publicPageCount = Math.ceil(resp.count / 10);
+      }
+      return resp.repositories;
+    });
+  };
+
+  loadPublicRepos();
 }
 
-function LandingCtrl($scope, $timeout, $location, Restangular, UserService, KeyService, PlanService) {
+function LandingCtrl($scope, UserService, ApiService) {
   $scope.namespace = null;
 
   $scope.$watch('namespace', function(namespace) {
     loadMyRepos(namespace);
   });
 
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-  }, true);
+  UserService.updateUserIn($scope, function() {
+    loadMyRepos($scope.namespace);
+  });
 
   $scope.canCreateRepo = function(namespace) {
     if (!$scope.user) { return false; }
@@ -144,40 +151,57 @@ function LandingCtrl($scope, $timeout, $location, Restangular, UserService, KeyS
       return;
     }
 
-    $scope.loadingmyrepos = true;
-
-    // Load the list of repositories.
-    var params = {
-      'limit': 4,
-      'public': false,
-      'sort': true,
-      'namespace': namespace
-    };
-
-    var repositoryFetch = Restangular.all('repository/');
-    repositoryFetch.getList(params).then(function(resp) {
-      $scope.myrepos = resp.repositories;
-      $scope.loadingmyrepos = false;
+    var options = {'limit': 4, 'public': false, 'sort': true, 'namespace': namespace };
+    $scope.my_repositories = ApiService.listReposAsResource().withOptions(options).get(function(resp) {
+      return resp.repositories;
     });
   };
 
   browserchrome.update();
 }
 
-function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $timeout) {
+function RepoCtrl($scope, $sanitize, Restangular, ImageMetadataService, ApiService, $routeParams, $rootScope, $location, $timeout) {
+  var namespace = $routeParams.namespace;
+  var name = $routeParams.name;
+
   $rootScope.title = 'Loading...';
 
+  // Watch for the destruction of the scope.
   $scope.$on('$destroy', function() {
     if ($scope.tree) {
       $scope.tree.dispose();
     }
   });
 
+  // Watch for changes to the repository.
+  $scope.$watch('repo', function() {
+    if ($scope.tree) {
+      $timeout(function() {
+        $scope.tree.notifyResized();
+      });
+    }
+  });
+
   // Watch for changes to the tag parameter.
   $scope.$on('$routeUpdate', function(){
-    $scope.setTag($location.search().tag, false);
+    if ($location.search().tag) {
+      $scope.setTag($location.search().tag, false);
+    } else if ($location.search().image) {
+      $scope.setImage($location.search().image, false);
+    } else {
+      $scope.setTag($location.search().tag, false);
+    }
   });
 
+  // Start scope methods //////////////////////////////////////////
+
+  $scope.getFormattedCommand = ImageMetadataService.getFormattedCommand;
+
+  $scope.getTooltipCommand = function(image) {
+    var sanitized = ImageMetadataService.getEscapedFormattedCommand(image);
+    return '<span class=\'codetooltip\'>' + sanitized + '</span>';
+  };
+
   $scope.updateForDescription = function(content) {
     $scope.repo.description = content;
     $scope.repo.put();
@@ -191,135 +215,10 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
       return moment($scope.parseDate(createdTime)).fromNow();
   };
 
-  var getDefaultTag = function() {
-    if ($scope.repo === undefined) {
-      return undefined;
-    } else if ($scope.repo.tags.hasOwnProperty('latest')) {
-      return $scope.repo.tags['latest'];
-    } else {
-      for (key in $scope.repo.tags) {
-        return $scope.repo.tags[key];
-      }
-    }
-  };
-
-  $scope.$watch('repo', function() {
-    if ($scope.tree) {
-      $timeout(function() {
-        $scope.tree.notifyResized();
-      });
-    }
-  });
-
-  var fetchRepository = function() {
-    var repositoryFetch = Restangular.one('repository/' + namespace + '/' + name);
-    repositoryFetch.get().then(function(repo) {
-      $rootScope.title = namespace + '/' + name;
-      
-      var kind = repo.is_public ? 'public' : 'private';
-      $rootScope.description = jQuery(getFirstTextLine(repo.description)).text() ||
-        'View of a ' + kind + ' docker repository on Quay';
-
-      $scope.repo = repo;
-
-      $scope.setTag($routeParams.tag);
-
-      $('#copyClipboard').clipboardCopy();
-      $scope.loading = false;
-
-      if (repo.is_building) {
-        startBuildInfoTimer(repo);
-      }  
-    }, function() {
-      $scope.repo = null;
-      $scope.loading = false;
-      $rootScope.title = 'Unknown Repository';
-    });
-  };
-
-  var startBuildInfoTimer = function(repo) {
-    if ($scope.interval) { return; }
-
-    getBuildInfo(repo);
-    $scope.interval = setInterval(function() {
-      $scope.$apply(function() { getBuildInfo(repo); });
-    }, 5000);
-
-    $scope.$on("$destroy", function() {
-      cancelBuildInfoTimer();
-    });
-  };
-
-  var cancelBuildInfoTimer = function() {
-    if ($scope.interval) {
-      clearInterval($scope.interval);
-    }
-  };
-
-  var getBuildInfo = function(repo) {
-    var buildInfo = Restangular.one('repository/' + repo.namespace + '/' + repo.name + '/build/');
-    buildInfo.get().then(function(resp) {
-      var runningBuilds = [];
-      for (var i = 0; i < resp.builds.length; ++i) {
-        var build = resp.builds[i];
-        if (build.status != 'complete') {
-          runningBuilds.push(build);
-        }
-      }
-
-      $scope.buildsInfo = runningBuilds;
-      if (!runningBuilds.length) {
-        // Cancel the build timer.
-        cancelBuildInfoTimer();
-
-        // Mark the repo as no longer building.
-        $scope.repo.is_building = false;
-
-        // Reload the repo information.
-        fetchRepository();
-        listImages();
-      }
-    });
-  };
-
-  var listImages = function() {
-    var imageFetch = Restangular.one('repository/' + namespace + '/' + name + '/image/');
-    imageFetch.get().then(function(resp) {
-      $scope.imageHistory = resp.images;
-
-      // Dispose of any existing tree.
-      if ($scope.tree) {
-        $scope.tree.dispose();
-      }
-
-      // Create the new tree.
-      $scope.tree = new ImageHistoryTree(namespace, name, resp.images,
-          getFirstTextLine, $scope.getTimeSince);
-
-      $scope.tree.draw('image-history-container');
-
-      // If we already have a tag, use it
-      if ($scope.currentTag) {
-        $scope.tree.setTag($scope.currentTag.name);
-      }
-
-      $($scope.tree).bind('tagChanged', function(e) {
-        $scope.$apply(function() { $scope.setTag(e.tag, true); });
-      });
-      $($scope.tree).bind('imageChanged', function(e) {
-        $scope.$apply(function() { $scope.setImage(e.image); });
-      });
-    });
-  };
-
   $scope.loadImageChanges = function(image) {
-    $scope.currentImageChanges = null;
-    
-    var changesFetch = Restangular.one('repository/' + namespace + '/' + name + '/image/' + image.id + '/changes');
-    changesFetch.get().then(function(changeInfo) {
-      $scope.currentImageChanges = changeInfo;
-    }, function() {
-      $scope.currentImageChanges = {'added': [], 'removed': [], 'changed': []};
+    var params = {'repository': namespace + '/' + name, 'image_id': image.id};
+    $scope.currentImageChangeResource = ApiService.getImageChangesAsResource(params).get(function(ci) {
+      $scope.currentImageChanges = ci;
     });
   };
 
@@ -333,12 +232,133 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
       addedDisplayed - removedDisplayed - changedDisplayed;
   };
 
-  $scope.setImage = function(image) {
+  $scope.setImage = function(imageId, opt_updateURL) {
+    var image = null;
+    for (var i = 0; i < $scope.images.length; ++i) {
+      var currentImage = $scope.images[i];
+      if (currentImage.id == imageId || currentImage.id.substr(0, 12) == imageId) {
+        image = currentImage;
+        break;
+      }
+    }
+
+    if (!image) { return; }
+
+    $scope.currentTag = null;
     $scope.currentImage = image;
     $scope.loadImageChanges(image);
     if ($scope.tree) {
-      $scope.tree.setImage($scope.currentImage.id);
+      $scope.tree.setImage(image.id);
     }
+
+    if (opt_updateURL) {
+      $location.search('tag', null);
+      $location.search('image', imageId.substr(0, 12));
+    }
+  };
+
+  $scope.tagSpecificImages = function(tagName) {
+    if (!tagName) { return []; }
+
+    var tag = $scope.repo.tags[tagName];
+    if (!tag) { return []; }
+
+    if ($scope.specificImages && $scope.specificImages[tagName]) {
+      return $scope.specificImages[tagName];
+    }
+
+    var getIdsForTag = function(currentTag) {
+      var ids = {};
+      forAllTagImages(currentTag, function(image) {
+        ids[image.dbid] = true;
+      });
+      return ids;
+    };
+
+    // Remove any IDs that match other tags.
+    var toDelete = getIdsForTag(tag);
+    for (var currentTagName in $scope.repo.tags) {
+      var currentTag = $scope.repo.tags[currentTagName];
+      if (currentTag != tag) {
+        for (var dbid in getIdsForTag(currentTag)) {
+          delete toDelete[dbid];
+        }
+      }
+    }
+
+    // Return the matching list of images.
+    var images = [];
+    for (var i = 0; i < $scope.images.length; ++i) {
+      var image = $scope.images[i];
+      if (toDelete[image.dbid]) {
+        images.push(image);
+      }
+    }
+      
+    images.sort(function(a, b) {
+      var result = new Date(b.created) - new Date(a.created);
+      if (result != 0) {
+        return result;
+      }
+
+      return b.dbid - a.dbid;
+    });
+
+    $scope.specificImages[tagName] = images;
+    return images;
+  };
+
+  $scope.askDeleteTag = function(tagName) {
+    if (!$scope.repo.can_admin) { return; }
+
+    $scope.tagToDelete = tagName;
+    $('#confirmdeleteTagModal').modal('show');
+  };
+
+  $scope.deleteTag = function(tagName) {
+    if (!$scope.repo.can_admin) { return; }
+    $('#confirmdeleteTagModal').modal('hide');
+
+    var params = {
+      'repository': namespace + '/' + name,
+      'tag': tagName
+    };
+
+    ApiService.deleteFullTag(null, params).then(function() {
+      loadViewInfo();
+    }, function(resp) {
+      bootbox.dialog({
+        "message": resp.data ? resp.data : 'Could not delete tag',
+        "title": "Cannot delete tag",
+        "buttons": {
+          "close": {
+            "label": "Close",
+            "className": "btn-primary"
+          }
+        }
+      });
+    });
+  };
+
+  $scope.getImagesForTagBySize = function(tag) {
+    var images = [];
+    forAllTagImages(tag, function(image) {
+        images.push(image);
+    });
+
+    images.sort(function(a, b) {
+      return b.size - a.size;
+    });
+
+    return images;
+  };
+
+  $scope.getTotalSize = function(tag) {
+    var size = 0;
+    forAllTagImages(tag, function(image) {
+      size += image.size;
+    });
+    return size;
   };
 
   $scope.setTag = function(tagName, opt_updateURL) {
@@ -362,9 +382,31 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
       } 
 
       if (opt_updateURL) {
+        $location.search('image', null);
         $location.search('tag', $scope.currentTag.name);
       }
     }
+
+    if ($scope.currentTag && !repo.tags[$scope.currentTag.name]) {
+      $scope.currentTag = null;
+      $scope.currentImage = null;
+    }
+  };
+
+  $scope.getFirstTextLine = getFirstTextLine;
+
+  $scope.getImageListingClasses = function(image, tagName) {
+    var classes = '';
+    if (image.ancestors.length > 1) {
+      classes += 'child ';
+    }
+ 
+    var currentTag = $scope.repo.tags[tagName];
+    if (image.dbid == currentTag.image.dbid) {
+      classes += 'tag-image ';
+    }
+
+    return classes;
   };
 
   $scope.getTagCount = function(repo) {
@@ -376,24 +418,205 @@ function RepoCtrl($scope, Restangular, $routeParams, $rootScope, $location, $tim
     return count;
   };
 
-  var namespace = $routeParams.namespace;
-  var name = $routeParams.name;
+  $scope.hideTagMenu = function(tagName, clientX, clientY) {
+    $scope.currentMenuTag = null;
 
-  $scope.loading = true;
+    var tagMenu = $("#tagContextMenu");
+    tagMenu.hide();
+  };
 
-  // Fetch the repo.
-  fetchRepository();
+  $scope.showTagMenu = function(tagName, clientX, clientY) {
+    if (!$scope.repo.can_admin) { return; }
 
-  // Fetch the image history.
-  listImages();
+    $scope.currentMenuTag = tagName;
+
+    var tagMenu = $("#tagContextMenu");
+    tagMenu.css({
+      display: "block",
+      left: clientX,
+      top: clientY
+    });
+
+    tagMenu.on("blur", function() {
+      setTimeout(function() {
+        tagMenu.hide();
+      }, 100); // Needed to allow clicking on menu items.
+    });
+
+    tagMenu.on("click", "a", function() {
+      setTimeout(function() {
+        tagMenu.hide();
+      }, 100); // Needed to allow clicking on menu items.
+    });
+
+    tagMenu[0].focus();
+  };
+
+  var getDefaultTag = function() {
+    if ($scope.repo === undefined) {
+      return undefined;
+    } else if ($scope.repo.tags.hasOwnProperty('latest')) {
+      return $scope.repo.tags['latest'];
+    } else {
+      for (key in $scope.repo.tags) {
+        return $scope.repo.tags[key];
+      }
+    }
+  };
+
+  var forAllTagImages = function(tag, callback) {
+    if (!tag || !$scope.imageByDBID) { return; }
+
+    callback(tag.image);
+
+    var ancestors = tag.image.ancestors.split('/');
+    for (var i = 0; i < ancestors.length; ++i) {
+      var image = $scope.imageByDBID[ancestors[i]];
+      if (image) {
+        callback(image);
+      }
+    }
+  };
+
+  var fetchRepository = function() {
+    var params = {'repository': namespace + '/' + name};
+    $rootScope.title = 'Loading Repository...';
+    $scope.repository = ApiService.getRepoAsResource(params).get(function(repo) {
+      // Set the repository object.
+      $scope.repo = repo;
+
+      // Set the default tag.
+      $scope.setTag($routeParams.tag);
+
+      // Set the title of the page.
+      var qualifiedRepoName = namespace + '/' + name;
+      $rootScope.title = qualifiedRepoName;
+      var kind = repo.is_public ? 'public' : 'private';
+      $rootScope.description = jQuery(getFirstTextLine(repo.description)).text() ||
+        'Visualization of images and tags for ' + kind + ' Docker repository: ' + qualifiedRepoName;
+
+      // If the repository is marked as building, start monitoring it for changes.
+      if (repo.is_building) {
+        startBuildInfoTimer(repo);
+      }
+
+      $('#copyClipboard').clipboardCopy();
+    });
+  };
+
+  var startBuildInfoTimer = function(repo) {
+    if ($scope.interval) { return; }
+
+    getBuildInfo(repo);
+    $scope.interval = setInterval(function() {
+      $scope.$apply(function() { getBuildInfo(repo); });
+    }, 5000);
+
+    $scope.$on("$destroy", function() {
+      cancelBuildInfoTimer();
+    });
+  };
+
+  var cancelBuildInfoTimer = function() {
+    if ($scope.interval) {
+      clearInterval($scope.interval);
+    }
+  };
+
+  var getBuildInfo = function(repo) {
+    // Note: We use restangular manually here because we need to turn off the loading bar.
+    var buildInfo = Restangular.one('repository/' + repo.namespace + '/' + repo.name + '/build/');
+    buildInfo.withHttpConfig({
+      'ignoreLoadingBar': true
+    });
+
+    buildInfo.get().then(function(resp) {
+      var runningBuilds = [];
+      for (var i = 0; i < resp.builds.length; ++i) {
+        var build = resp.builds[i];
+        if (build.status != 'complete') {
+          runningBuilds.push(build);
+        }
+      }
+
+      $scope.buildsInfo = runningBuilds;
+      if (!runningBuilds.length) {
+        // Cancel the build timer.
+        cancelBuildInfoTimer();
+
+        // Mark the repo as no longer building.
+        $scope.repo.is_building = false;
+
+        // Reload the repo information.
+        loadViewInfo();
+      }
+    });
+  };
+
+  var listImages = function() {
+    var params = {'repository': namespace + '/' + name};    
+    $scope.imageHistory = ApiService.listRepositoryImagesAsResource(params).get(function(resp) {
+      $scope.images = resp.images;
+      $scope.specificImages = [];
+
+      // Build various images for quick lookup of images.
+      $scope.imageByDBID = {};
+      for (var i = 0; i < $scope.images.length; ++i) {
+        var currentImage = $scope.images[i];
+        $scope.imageByDBID[currentImage.dbid] = currentImage;
+      }
+
+      // Dispose of any existing tree.
+      if ($scope.tree) {
+        $scope.tree.dispose();
+      }
+
+      // Create the new tree.
+      $scope.tree = new ImageHistoryTree(namespace, name, resp.images,
+          getFirstTextLine, $scope.getTimeSince, ImageMetadataService.getEscapedFormattedCommand);
+
+      $scope.tree.draw('image-history-container');
+
+      // If we already have a tag, use it
+      if ($scope.currentTag) {
+        $scope.tree.setTag($scope.currentTag.name);
+      }
+
+      // Listen for changes to the selected tag and image in the tree.
+      $($scope.tree).bind('tagChanged', function(e) {
+        $scope.$apply(function() { $scope.setTag(e.tag, true); });
+      });
+
+      $($scope.tree).bind('imageChanged', function(e) {
+        $scope.$apply(function() { $scope.setImage(e.image.id, true); });
+      });
+
+      $($scope.tree).bind('showTagMenu', function(e) {
+        $scope.$apply(function() { $scope.showTagMenu(e.tag, e.clientX, e.clientY); });
+      });
+
+      $($scope.tree).bind('hideTagMenu', function(e) {
+        $scope.$apply(function() { $scope.hideTagMenu(); });
+      });
+
+      if ($routeParams.image) {
+        $scope.setImage($routeParams.image);
+      }
+
+      return resp.images;
+    });
+  };
+
+  var loadViewInfo = function() {
+    fetchRepository();
+    listImages();
+  };
+
+  // Fetch the repository itself as well as the image history.
+  loadViewInfo();
 }
 
-function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
-  $('.info-icon').popover({
-      'trigger': 'hover',
-      'html': true
-  });
-
+function RepoAdminCtrl($scope, Restangular, ApiService, $routeParams, $rootScope) {
   var namespace = $routeParams.namespace;
   var name = $routeParams.name;
 
@@ -480,8 +703,8 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
       'friendlyName': $scope.newToken.friendlyName
     };
 
-    var permissionPost = Restangular.one('repository/' + namespace + '/' + name + '/tokens/');
-    permissionPost.customPOST(friendlyName).then(function(newToken) {
+    var params = {'repository': namespace + '/' + name};
+    ApiService.createToken(friendlyName, params).then(function(newToken) {
       $scope.newToken.friendlyName = '';
       $scope.createTokenForm.$setPristine();
       $scope.tokens[newToken.code] = newToken;
@@ -489,8 +712,12 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
   };
 
   $scope.deleteToken = function(tokenCode) {
-    var deleteAction = Restangular.one('repository/' + namespace + '/' + name + '/tokens/' + tokenCode);
-    deleteAction.customDELETE().then(function() {
+    var params = {
+      'repository': namespace + '/' + name,
+      'code': tokenCode
+    };
+
+    ApiService.deleteToken(null, params).then(function() {
       delete $scope.tokens[tokenCode];
     });
   };
@@ -500,8 +727,12 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
       'role': newAccess
     };
 
-    var deleteAction = Restangular.one('repository/' + namespace + '/' + name + '/tokens/' + tokenCode);
-    deleteAction.customPUT(role).then(function(updated) {
+    var params = {
+      'repository': namespace + '/' + name,
+      'code': tokenCode
+    };
+
+    ApiService.changeToken(role, params).then(function(updated) {
       $scope.tokens[updated.code] = updated;
     });
   };
@@ -523,8 +754,12 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
     var visibility = {
       'visibility': newAccess
     };
-    var visibilityPost = Restangular.one('repository/' + namespace + '/' + name + '/changevisibility');
-    visibilityPost.customPOST(visibility).then(function() {
+
+    var params = {
+      'repository': namespace + '/' + name
+    };
+
+    ApiService.changeRepoVisibility(visibility, params).then(function() {
       $scope.repo.is_public = newAccess == 'public';
     }, function() {
       $('#cannotchangeModal').modal({});
@@ -538,8 +773,11 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
   $scope.deleteRepo = function() {
     $('#confirmdeleteModal').modal('hide');
 
-    var deleteAction = Restangular.one('repository/' + namespace + '/' + name);
-    deleteAction.customDELETE().then(function() {
+    var params = {
+      'repository': namespace + '/' + name
+    };
+
+    ApiService.deleteRepository(null, params).then(function() {
       $scope.repo = null;
       
       setTimeout(function() {
@@ -550,107 +788,146 @@ function RepoAdminCtrl($scope, Restangular, $routeParams, $rootScope) {
     });
   };
 
-  $scope.loading = true;
+  $scope.loadWebhooks = function() {
+    var params = {
+      'repository': namespace + '/' + name
+    };
 
-  var checkLoading = function() {
-    $scope.loading = !($scope.permissions['user'] && $scope.permissions['team'] && $scope.repo && $scope.tokens);
+    $scope.newWebhook = {};
+    $scope.webhooksResource = ApiService.listWebhooksAsResource(params).get(function(resp) {
+      $scope.webhooks = resp.webhooks;
+      return $scope.webhooks;
+    });
+  };
+
+  $scope.createWebhook = function() {
+    if (!$scope.newWebhook.url) {
+      return;
+    }
+
+    var params = {
+      'repository': namespace + '/' + name
+    };
+
+    ApiService.createWebhook($scope.newWebhook, params).then(function(resp) {
+      $scope.webhooks.push(resp);
+      $scope.newWebhook.url = '';
+      $scope.createWebhookForm.$setPristine();
+    });
+  };
+
+  $scope.deleteWebhook = function(webhook) {
+    var params = {
+      'repository': namespace + '/' + name,
+      'public_id': webhook.public_id
+    };
+
+    ApiService.deleteWebhook(null, params).then(function(resp) {
+      $scope.webhooks.splice($scope.webhooks.indexOf(webhook), 1);
+    });
+  };
+
+  var fetchTokens = function() {
+    var params = {
+      'repository': namespace + '/' + name
+    };
+
+    ApiService.listRepoTokens(null, params).then(function(resp) {
+      $scope.tokens = resp.tokens;
+    }, function() {
+      $scope.tokens = null;
+    });
   };
 
   var fetchPermissions = function(kind) {
     var permissionsFetch = Restangular.one('repository/' + namespace + '/' + name + '/permissions/' + kind + '/');
     permissionsFetch.get().then(function(resp) {
+      $scope.permissions[kind] = resp.permissions;
+    }, function() {
+      $scope.permissions[kind] = null;
+    });
+  };
+
+  var fetchRepository = function() {
+    var params = {
+      'repository': namespace + '/' + name
+    };
+
+    $scope.repository = ApiService.getRepoAsResource(params).get(function(repo) {
+      $scope.repo = repo;
+
       $rootScope.title = 'Settings - ' + namespace + '/' + name;
       $rootScope.description = 'Administrator settings for ' + namespace + '/' + name +
           ': Permissions, webhooks and other settings';
-      $scope.permissions[kind] = resp.permissions;
-      checkLoading();
-    }, function() {
-      $scope.permissions[kind] = null;
-      $rootScope.title = 'Unknown Repository';
-      $scope.loading = false;
+
+      // Fetch all the permissions and token info for the repository.
+      fetchPermissions('user');
+      fetchPermissions('team');
+      fetchTokens();
+
+      $('.info-icon').popover({
+        'trigger': 'hover',
+        'html': true
+      });
+
+      return $scope.repo;
     });
   };
 
-  // Fetch the repository information.
-  var repositoryFetch = Restangular.one('repository/' + namespace + '/' + name);
-  repositoryFetch.get().then(function(repo) {
-    $scope.repo = repo;
-    $scope.loading = !($scope.permissions && $scope.repo && $scope.tokens);
-  }, function() {
-    $scope.permissions = null;
-    $rootScope.title = 'Unknown Repository';
-    $scope.loading = false;
-  });
-
-  // Fetch the user and team permissions.
-  fetchPermissions('user');
-  fetchPermissions('team');
-
-  // Fetch the tokens.
-  var tokensFetch = Restangular.one('repository/' + namespace + '/' + name + '/tokens/');
-  tokensFetch.get().then(function(resp) {
-    $scope.tokens = resp.tokens;
-    checkLoading();
-  }, function() {
-    $scope.tokens = null;
-    $scope.loading = false;
-  });
-
-  $scope.webhooksLoading = true;
-  $scope.loadWebhooks = function() {
-    $scope.webhooksLoading = true;
-    var fetchWebhooks = Restangular.one('repository/' + namespace + '/' + name + '/webhook/');
-    fetchWebhooks.get().then(function(resp) {
-      $scope.webhooks = resp.webhooks;
-      $scope.webhooksLoading = false;
-    });
-  };
-
-  $scope.createWebhook = function() {
-    var newWebhook = Restangular.one('repository/' + namespace + '/' + name + '/webhook/');
-    newWebhook.customPOST($scope.newWebhook).then(function(resp) {
-      $scope.webhooks.push(resp);
-      $scope.newWebhook.url = '';
-      $scope.newWebhookForm.$setPristine();
-    });
-  };
-
-  $scope.deleteWebhook = function(webhook) {
-    var deleteWebhookReq = Restangular.one('repository/' + namespace + '/' + name + '/webhook/' + webhook.public_id);
-    deleteWebhookReq.customDELETE().then(function(resp) {
-      $scope.webhooks.splice($scope.webhooks.indexOf(webhook), 1);
-    });
-  };
+  // Fetch the repository.
+  fetchRepository();
 }
 
-function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, UserService, KeyService, $routeParams) {
-  $scope.$watch(function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.askForPassword = currentUser.askForPassword;
-    if (!currentUser.anonymous) {
-      $scope.user = currentUser;
+function UserAdminCtrl($scope, $timeout, $location, ApiService, PlanService, UserService, KeyService, $routeParams, $http) {
+  if ($routeParams['migrate']) {
+    $('#migrateTab').tab('show')
+  }
+
+  UserService.updateUserIn($scope, function(user) {
+    $scope.askForPassword = user.askForPassword;
+    $scope.cuser = jQuery.extend({}, user);
+
+    for (var i = 0; i < $scope.cuser.logins.length; i++) {
+      if ($scope.cuser.logins[i].service == 'github') {
+        var githubId = $scope.cuser.logins[i].service_identifier;
+        $http.get('https://api.github.com/user/' + githubId).success(function(resp) {
+          $scope.githubLogin = resp.login;
+        });
+      }
     }
-    $scope.loading = false;
-  }, true);
+  });
 
   $scope.readyForPlan = function() {
     // Show the subscribe dialog if a plan was requested.
     return $routeParams['plan'];
   };
 
-  if ($routeParams['migrate']) {
-    $('#migrateTab').tab('show')
-  }
-
   $scope.loading = true;
   $scope.updatingUser = false;
   $scope.changePasswordSuccess = false;
   $scope.convertStep = 0;
   $scope.org = {};
+  $scope.githubRedirectUri = KeyService.githubRedirectUri;
+  $scope.githubClientId = KeyService.githubClientId;
 
   $('.form-change-pw').popover();
 
+  $scope.logsShown = 0;
+  $scope.invoicesShown = 0;
+  
+  $scope.loadLogs = function() {
+    if (!$scope.hasPaidBusinessPlan) { return; }
+    $scope.logsShown++;
+  };
+
+  $scope.loadInvoices = function() {
+    if (!$scope.hasPaidBusinessPlan) { return; }
+    $scope.invoicesShown++;
+  };
+
   $scope.planChanged = function(plan) {
     $scope.hasPaidPlan = plan && plan.price > 0;
+    $scope.hasPaidBusinessPlan = PlanService.isOrgCompatible(plan) && plan.price > 0;
   };
 
   $scope.showConvertForm = function() {
@@ -659,7 +936,7 @@ function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, Us
     });
 
     PlanService.getPlans(function(plans) {
-      $scope.orgPlans = plans.business;
+      $scope.orgPlans = plans;
     });
       
     $scope.convertStep = 1;
@@ -678,8 +955,7 @@ function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, Us
       'plan': $scope.org.plan.stripeId
     };
 
-    var convertAccount = Restangular.one('user/convert');
-    convertAccount.customPOST(data).then(function(resp) {
+    ApiService.convertUserToOrganization(data).then(function(resp) {
       UserService.load();
       $location.path('/');
     }, function(resp) {
@@ -696,14 +972,14 @@ function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, Us
     $('.form-change-pw').popover('hide');
     $scope.updatingUser = true;
     $scope.changePasswordSuccess = false;
-    var changePasswordPost = Restangular.one('user/');
-    changePasswordPost.customPUT($scope.user).then(function() {
+
+    ApiService.changeUserDetails($scope.cuser).then(function() {
       $scope.updatingUser = false;
       $scope.changePasswordSuccess = true;
 
       // Reset the form
-      $scope.user.password = '';
-      $scope.user.repeatPassword = '';
+      $scope.cuser.password = '';
+      $scope.cuser.repeatPassword = '';
       $scope.changePasswordForm.$setPristine();
 
       // Reload the user.
@@ -719,12 +995,12 @@ function UserAdminCtrl($scope, $timeout, $location, Restangular, PlanService, Us
   };
 }
 
-function ImageViewCtrl($scope, $routeParams, $rootScope, Restangular) {  
+function ImageViewCtrl($scope, $routeParams, $rootScope, $timeout, ApiService, ImageMetadataService) {  
   var namespace = $routeParams.namespace;
   var name = $routeParams.name;
   var imageid = $routeParams.image;
 
-  $('#copyClipboard').clipboardCopy();
+  $scope.getFormattedCommand = ImageMetadataService.getFormattedCommand;
 
   $scope.parseDate = function(dateString) {
     return Date.parse(dateString);
@@ -771,60 +1047,72 @@ function ImageViewCtrl($scope, $routeParams, $rootScope, Restangular) {
     if ($scope.tree) { return; }
     
     $scope.tree = new ImageFileChangeTree($scope.image, $scope.combinedChanges);
-    setTimeout(function() {
+    $timeout(function() {
       $scope.tree.draw('changes-tree-container');
     }, 10);
   };
 
-  // Fetch the image.
-  var imageFetch = Restangular.one('repository/' + namespace + '/' + name + '/image/' + imageid);
-  imageFetch.get().then(function(image) {
-    $scope.loading = false;
-    $scope.repo = {
-      'name': name,
-      'namespace': namespace
+  var fetchImage = function() {
+    var params = {
+      'repository': namespace + '/' + name,
+      'image_id': imageid  
     };
-    $scope.image = image;
-    $rootScope.title = 'View Image - ' + image.id;
-    $rootScope.description = 'Viewing docker image ' + image.id + ' under repository ' + namespace + '/' + name +
+
+    $scope.image = ApiService.getImageAsResource(params).get(function(image) {
+      $scope.repo = {
+        'name': name,
+        'namespace': namespace
+      };
+
+      $rootScope.title = 'View Image - ' + image.id;
+      $rootScope.description = 'Viewing docker image ' + image.id + ' under repository ' + namespace + '/' + name +
         ': Image changes tree and list view';
-  }, function() {
-    $rootScope.title = 'Unknown Image';
-    $scope.loading = false;
-  });
 
-  // Fetch the image changes.
-  var changesFetch = Restangular.one('repository/' + namespace + '/' + name + '/image/' + imageid + '/changes');
-  changesFetch.get().then(function(changes) {
-    var combinedChanges = [];
-    var addCombinedChanges = function(c, kind) {
-      for (var i = 0;  i < c.length; ++i) {
-        combinedChanges.push({ 
-          'kind': kind,
-          'file': c[i]
-        });
-      }
+      // Fetch the image's changes.
+      fetchChanges();
+
+      $('#copyClipboard').clipboardCopy();
+
+      return image;
+    });
+  };
+
+  var fetchChanges = function() {
+    var params = {
+      'repository': namespace + '/' + name,
+      'image_id': imageid  
     };
 
-    addCombinedChanges(changes.added, 'added');
-    addCombinedChanges(changes.removed, 'removed');
-    addCombinedChanges(changes.changed, 'changed');
+    ApiService.getImageChanges(null, params).then(function(changes) {
+      var combinedChanges = [];
+      var addCombinedChanges = function(c, kind) {
+        for (var i = 0;  i < c.length; ++i) {
+          combinedChanges.push({ 
+            'kind': kind,
+            'file': c[i]
+          });
+        }
+      };
 
-    $scope.combinedChanges = combinedChanges;
-    $scope.imageChanges = changes;
-  });
+      addCombinedChanges(changes.added, 'added');
+      addCombinedChanges(changes.removed, 'removed');
+      addCombinedChanges(changes.changed, 'changed');
+
+      $scope.combinedChanges = combinedChanges;
+      $scope.imageChanges = changes;
+    });
+  };
+
+  // Fetch the image.
+  fetchImage();
 }
 
 function V1Ctrl($scope, $location, UserService) {
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-  }, true);
+  UserService.updateUserIn($scope);
 }
 
-function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangular, PlanService) {
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-  }, true);
+function NewRepoCtrl($scope, $location, $http, $timeout, UserService, ApiService, PlanService) {
+  UserService.updateUserIn($scope);
 
   $scope.repo = {
     'is_public': 1,
@@ -838,6 +1126,102 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
     });
   });
 
+  // Watch the namespace on the repo. If it changes, we update the plan and the public/private
+  // accordingly.
+  $scope.isUserNamespace = true;
+  $scope.$watch('repo.namespace', function(namespace) {
+    // Note: Can initially be undefined.
+    if (!namespace) { return; }
+    
+    var isUserNamespace = (namespace == $scope.user.username);
+
+    $scope.checkingPlan = true;
+    $scope.planRequired = null;
+    $scope.isUserNamespace = isUserNamespace;
+
+    if (isUserNamespace) {
+      // Load the user's subscription information in case they want to create a private
+      // repository.
+      ApiService.getUserPrivateCount().then(function(resp) {
+        if (resp.privateCount + 1 > resp.reposAllowed) {
+          PlanService.getMinimumPlan(resp.privateCount + 1, false, function(minimum) {
+            $scope.planRequired = minimum;
+          });
+        }
+
+        $scope.checkingPlan = false;
+      }, function() {
+        $scope.planRequired = {};
+        $scope.checkingPlan = false;
+      });
+    } else {
+      ApiService.getOrganizationPrivateAllowed(null, {'orgname': namespace}).then(function(resp) {
+        $scope.planRequired = resp.privateAllowed ? null : {};
+        $scope.checkingPlan = false;
+      }, function() {
+        $scope.planRequired = {};
+        $scope.checkingPlan = false;
+      });
+
+      // Auto-set to private repo.
+      $scope.repo.is_public = '0';
+    }
+  });
+
+  $scope.createNewRepo = function() {
+    $('#repoName').popover('hide');
+
+    var uploader = $('#file-drop')[0];
+    if ($scope.repo.initialize && uploader.files.length < 1) {
+      $('#missingfileModal').modal();
+      return;
+    }
+
+    $scope.creating = true;
+    var repo = $scope.repo;
+    var data = {
+      'namespace': repo.namespace,
+      'repository': repo.name,
+      'visibility': repo.is_public == '1' ? 'public' : 'private',
+      'description': repo.description
+    };
+
+    ApiService.createRepo(data).then(function(created) {
+      $scope.creating = false;
+      $scope.created = created;
+
+      // Repository created. Start the upload process if applicable.
+      if ($scope.repo.initialize) {
+        startFileUpload(created);
+        return;
+      }
+
+      // Otherwise, redirect to the repo page.
+      $location.path('/repository/' + created.namespace + '/' + created.name);
+    }, function(result) {
+      $scope.creating = false;
+      $scope.createError = result.data;
+      $timeout(function() {
+        $('#repoName').popover('show');
+      });
+    });
+  };
+
+  $scope.upgradePlan = function() {
+    var callbacks = {
+      'started': function() { $scope.planChanging = true; },
+      'opened': function() { $scope.planChanging = true; },
+      'closed': function() { $scope.planChanging = false; },
+      'success': subscribedToPlan,
+      'failure': function(resp) {
+        $('#couldnotsubscribeModal').modal();
+        $scope.planChanging = false;
+      }
+    };
+
+    PlanService.changePlan($scope, null, $scope.planRequired.stripeId, callbacks);
+  };
+ 
   var startBuild = function(repo, fileId) {
     $scope.building = true;
 
@@ -845,9 +1229,12 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
       'file_id': fileId
     };
 
-    var startBuildCall = Restangular.one('repository/' + repo.namespace + '/' + repo.name + '/build/');
-    startBuildCall.customPOST(data).then(function(resp) {
-      $location.path('/repository/' + repo.namespace + '/' + repo.name);
+    var params = {
+      'repository': repo.namespace + '/' + repo.name
+    };
+
+    ApiService.requestRepoBuild(data, params).then(function(resp) {
+      $location.path('/repository/' + params.repository);
     }, function() {
       $('#couldnotbuildModal').modal();
     });
@@ -896,8 +1283,7 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
       'mimeType': mimeType
     };
 
-    var getUploadUrl = Restangular.one('filedrop/');
-    getUploadUrl.customPOST(data).then(function(resp) {
+    var getUploadUrl = ApiService.getFiledropUrl(data).then(function(resp) {
       conductUpload(repo, file, resp.url, resp.file_id, mimeType);
     }, function() {        
       $('#couldnotbuildModal').modal();
@@ -923,120 +1309,14 @@ function NewRepoCtrl($scope, $location, $http, $timeout, UserService, Restangula
       }
     });
   };
-
-  $scope.createNewRepo = function() {
-    $('#repoName').popover('hide');
-
-    var uploader = $('#file-drop')[0];
-    if ($scope.repo.initialize && uploader.files.length < 1) {
-      $('#missingfileModal').modal();
-      return;
-    }
-
-    $scope.creating = true;
-    var repo = $scope.repo;
-    var data = {
-      'namespace': repo.namespace,
-      'repository': repo.name,
-      'visibility': repo.is_public == '1' ? 'public' : 'private',
-      'description': repo.description
-    };
-
-    var createPost = Restangular.one('repository');
-    createPost.customPOST(data).then(function(created) {
-      $scope.creating = false;
-      $scope.created = created;
-
-      // Repository created. Start the upload process if applicable.
-      if ($scope.repo.initialize) {
-        startFileUpload(created);
-        return;
-      }
-
-      // Otherwise, redirect to the repo page.
-      $location.path('/repository/' + created.namespace + '/' + created.name);
-    }, function(result) {
-      $scope.creating = false;
-      $scope.createError = result.data;
-      $timeout(function() {
-        $('#repoName').popover('show');
-      });
-    });
-  };
-
-  $scope.upgradePlan = function() {
-    var callbacks = {
-      'started': function() { $scope.planChanging = true; },
-      'opened': function() { $scope.planChanging = true; },
-      'closed': function() { $scope.planChanging = false; },
-      'success': subscribedToPlan,
-      'failure': function(resp) {
-        $('#couldnotsubscribeModal').modal();
-        $scope.planChanging = false;
-      }
-    };
-
-    PlanService.changePlan($scope, null, $scope.planRequired.stripeId, callbacks);
-  };
- 
-  // Watch the namespace on the repo. If it changes, we update the plan and the public/private
-  // accordingly.
-  $scope.isUserNamespace = true;
-  $scope.$watch('repo.namespace', function(namespace) {
-    // Note: Can initially be undefined.
-    if (!namespace) { return; }
-    
-    var isUserNamespace = (namespace == $scope.user.username);
-
-    $scope.planRequired = null;
-    $scope.isUserNamespace = isUserNamespace;
-
-    if (isUserNamespace) {
-      // Load the user's subscription information in case they want to create a private
-      // repository.
-      PlanService.getSubscription(null, subscribedToPlan, function() {
-        PlanService.getMinimumPlan(1, false, function(minimum) { $scope.planRequired = minimum; });
-      });
-    } else {
-      $scope.planRequired = null;
-
-      var checkPrivateAllowed = Restangular.one('organization/' + namespace  + '/private');
-      checkPrivateAllowed.get().then(function(resp) {
-        $scope.planRequired = resp.privateAllowed ? null : {};
-      }, function() {
-        $scope.planRequired = {};
-      });
-
-      // Auto-set to private repo.
-      $scope.repo.is_public = '0';
-    }
-  });
 }
 
-function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
-  $('.info-icon').popover({
-      'trigger': 'hover',
-      'html': true
-  });
+function OrgViewCtrl($rootScope, $scope, ApiService, $routeParams) {
+  var orgname = $routeParams.orgname;
 
   $scope.TEAM_PATTERN = TEAM_PATTERN;
   $rootScope.title = 'Loading...';
 
-  var orgname = $routeParams.orgname;
-
-  var loadOrganization = function() {
-    var getOrganization = Restangular.one(getRestUrl('organization', orgname));
-    getOrganization.get().then(function(resp) {
-      $scope.organization = resp;
-      $scope.loading = false;
-
-      $rootScope.title = orgname;
-      $rootScope.description = 'Viewing organization ' + orgname;
-    }, function() {
-      $scope.loading = false;
-    });
-  };
-
   $scope.teamRoles = [
       { 'id': 'member', 'title': 'Member', 'kind': 'default' },
       { 'id': 'creator', 'title': 'Creator', 'kind': 'success' },
@@ -1047,10 +1327,14 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
     var previousRole = $scope.organization.teams[teamname].role;
     $scope.organization.teams[teamname].role = role;
 
-    var updateTeam = Restangular.one(getRestUrl('organization', orgname, 'team', teamname));
+    var params = {
+      'orgname': orgname,
+      'teamname': teamname
+    };
+
     var data = $scope.organization.teams[teamname];
 
-    updateTeam.customPUT(data).then(function(resp) {
+    ApiService.updateOrganizationTeam(data, params).then(function(resp) {
     }, function(resp) {     
       $scope.organization.teams[teamname].role = previousRole;
       $scope.roleError = resp.data || '';
@@ -1071,7 +1355,7 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
       return;
     }
 
-    createOrganizationTeam(Restangular, orgname, teamname, function(created) {
+    createOrganizationTeam(ApiService, orgname, teamname, function(created) {
       $scope.organization.teams[teamname] = created;
     });
   };
@@ -1086,8 +1370,12 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
     if (!$scope.currentDeleteTeam) { return; }
 
     var teamname = $scope.currentDeleteTeam;
-    var deleteAction = Restangular.one(getRestUrl('organization', orgname, 'team', teamname));
-    deleteAction.customDELETE().then(function() {
+    var params = {
+      'orgname': orgname,
+      'teamname': teamname
+    };
+
+    ApiService.deleteOrganizationTeam(null, params).then(function() {
       delete $scope.organization.teams[teamname];
       $scope.currentDeleteTeam = null;
     }, function() {
@@ -1096,63 +1384,64 @@ function OrgViewCtrl($rootScope, $scope, Restangular, $routeParams) {
     });
   };
 
+  var loadOrganization = function() {
+    $scope.orgResource = ApiService.getOrganizationAsResource({'orgname': orgname}).get(function(org) {
+      $scope.organization = org;
+      $rootScope.title = orgname;
+      $rootScope.description = 'Viewing organization ' + orgname;
+
+      $('.info-icon').popover({
+        'trigger': 'hover',
+        'html': true
+      });
+    });
+  };
+
+  // Load the organization.
   loadOrganization();
 }
 
-function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService, PlanService) {
+function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService, PlanService, ApiService) {
+  var orgname = $routeParams.orgname;
+
   // Load the list of plans.
   PlanService.getPlans(function(plans) {
-    $scope.plans = plans.business;
+    $scope.plans = plans;
     $scope.plan_map = {};
 
-    var addPlans = function(plans) {
-      for (var i = 0; i < plans.length; ++i) {
-        $scope.plan_map[plans[i].stripeId] = plans[i];
-      }
-    };
-
-    addPlans(plans.user);
-    addPlans(plans.business);
+    for (var i = 0; i < plans.length; ++i) {
+      $scope.plan_map[plans[i].stripeId] = plans[i];
+    }
   });
 
-  var orgname = $routeParams.orgname;
-
   $scope.orgname = orgname;
   $scope.membersLoading = true;
   $scope.membersFound = null;
   $scope.invoiceLoading = true;
   $scope.logsShown = 0;
+  $scope.invoicesShown = 0;
   
   $scope.loadLogs = function() {
     $scope.logsShown++;
   };
 
+  $scope.loadInvoices = function() {
+    $scope.invoicesShown++;
+  };
+
   $scope.planChanged = function(plan) {
     $scope.hasPaidPlan = plan && plan.price > 0;
   };
 
-  $scope.loadInvoices = function() {
-    if ($scope.invoices) { return; }
-    $scope.invoiceLoading = true;
-    
-    var getInvoices = Restangular.one(getRestUrl('organization', orgname, 'invoices'));
-    getInvoices.get().then(function(resp) {
-      $scope.invoiceExpanded = {};
-      $scope.invoices = resp.invoices;
-      $scope.invoiceLoading = false;
-    });
-  };
-
-  $scope.toggleInvoice = function(id) {
-    $scope.invoiceExpanded[id] = !$scope.invoiceExpanded[id];
-  };
-
   $scope.loadMembers = function() {
     if ($scope.membersFound) { return; }
     $scope.membersLoading = true;
-    
-    var getMembers = Restangular.one(getRestUrl('organization', orgname, 'members'));
-    getMembers.get().then(function(resp) {
+
+    var params = {
+      'orgname': orgname
+    };
+
+    ApiService.getOrganizationMembers(null, params).then(function(resp) {
       var membersArray = [];
       for (var key in resp.members) {
         if (resp.members.hasOwnProperty(key)) {
@@ -1166,41 +1455,38 @@ function OrgAdminCtrl($rootScope, $scope, Restangular, $routeParams, UserService
   };
 
   var loadOrganization = function() {
-    var getOrganization = Restangular.one(getRestUrl('organization', orgname));
-    getOrganization.get().then(function(resp) {
-      if (resp && resp.is_admin) {
-        $scope.organization = resp;
+    $scope.orgResource = ApiService.getOrganizationAsResource({'orgname': orgname}).get(function(org) {
+      if (org && org.is_admin) {
+        $scope.organization = org;
         $rootScope.title = orgname + ' (Admin)';
         $rootScope.description = 'Administration page for organization ' + orgname;
       }
-
-      $scope.loading = false;
-    }, function() {
-      $scope.loading = false;
     });
   };
 
+  // Load the organization.
   loadOrganization();
 }
 
-function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
-  $('.info-icon').popover({
-      'trigger': 'hover',
-      'html': true
-  });
-
-  $scope.orgname = $routeParams.orgname;
+function TeamViewCtrl($rootScope, $scope, Restangular, ApiService, $routeParams) {
   var teamname = $routeParams.teamname;
+  var orgname = $routeParams.orgname;
+
+  $scope.orgname = orgname;
+  $scope.teamname = teamname;
 
   $rootScope.title = 'Loading...';
-  $scope.loading = true;
-  $scope.teamname = teamname;
 
   $scope.addNewMember = function(member) {
     if ($scope.members[member.name]) { return; }
 
-    var addMember = Restangular.one(getRestUrl('organization', $scope.orgname, 'team', teamname, 'members', member.name));
-    addMember.customPOST().then(function(resp) {
+    var params = {
+      'orgname': orgname,
+      'teamname': teamname,
+      'membername': member.name
+    };
+
+    ApiService.updateOrganizationTeamMember(null, params).then(function(resp) {
       $scope.members[member.name] = resp;
     }, function() {
       $('#cannotChangeMembersModal').modal({});
@@ -1208,8 +1494,13 @@ function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
   };
 
   $scope.removeMember = function(username) {
-    var removeMember = Restangular.one(getRestUrl('organization', $scope.orgname, 'team', teamname, 'members', username));
-    removeMember.customDELETE().then(function(resp) {
+    var params = {
+      'orgname': orgname,
+      'teamname': teamname,
+      'membername': username
+    };
+
+    ApiService.deleteOrganizationTeamMember(null, params).then(function(resp) {
       delete $scope.members[username];
     }, function() {
       $('#cannotChangeMembersModal').modal({});
@@ -1219,70 +1510,65 @@ function TeamViewCtrl($rootScope, $scope, Restangular, $routeParams) {
   $scope.updateForDescription = function(content) {
     $scope.organization.teams[teamname].description = content;
 
-    var updateTeam = Restangular.one(getRestUrl('organization', $scope.orgname, 'team', teamname));
-    var data = $scope.organization.teams[teamname];
-    updateTeam.customPUT(data).then(function(resp) {
+    var params = {
+      'orgname': orgname,
+      'teamname': teamname
+    };
+
+    var teaminfo = $scope.organization.teams[teamname];
+    ApiService.updateOrganizationTeam(teaminfo, params).then(function(resp) {
     }, function() {
       $('#cannotChangeTeamModal').modal({});
     });
   };
 
   var loadOrganization = function() {
-    var getOrganization = Restangular.one(getRestUrl('organization', $scope.orgname))
-    getOrganization.get().then(function(resp) {
-      $scope.organization = resp;
+    $scope.orgResource = ApiService.getOrganizationAsResource({'orgname': orgname}).get(function(org) {
+      $scope.organization = org;
       $scope.team = $scope.organization.teams[teamname];
-      $scope.loading = !$scope.organization || !$scope.members;
-    }, function() {
-      $scope.organization = null;
-      $scope.members = null;
-      $scope.loading = false;
+      $rootScope.title = teamname + ' (' + $scope.orgname + ')';
+      $rootScope.description = 'Team management page for team ' + teamname + ' under organization ' + $scope.orgname;
+      loadMembers();
+      return org;
     });
   };
 
   var loadMembers = function() {
-    var getMembers = Restangular.one(getRestUrl('organization', $scope.orgname, 'team', teamname, 'members'));
-    getMembers.get().then(function(resp) {
+    var params = {
+      'orgname': orgname,
+      'teamname': teamname
+    };
+
+    $scope.membersResource = ApiService.getOrganizationTeamMembersAsResource(params).get(function(resp) {
       $scope.members = resp.members;
       $scope.canEditMembers = resp.can_edit;
-      $scope.loading = !$scope.organization || !$scope.members;
-      $rootScope.title = teamname + ' (' + $scope.orgname + ')';
-      $rootScope.description = 'Team management page for team ' + teamname + ' under organization ' + $scope.orgname;
-    }, function() {
-      $scope.organization = null;
-      $scope.members = null;
-      $scope.loading = false;
+        
+      $('.info-icon').popover({
+        'trigger': 'hover',
+        'html': true
+      });
+
+      return resp.members;
     });
   };
 
+  // Load the organization.
   loadOrganization();
-  loadMembers();
 }
 
 function OrgsCtrl($scope, UserService) {
-  $scope.loading = true;
-
-  $scope.$watch( function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-    $scope.loading = false;
-  }, true);
-
+  UserService.updateUserIn($scope);
   browserchrome.update();
 }
 
-function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, PlanService, Restangular) {
-  $scope.loading = true;
-  
-  $scope.$watch(function () { return UserService.currentUser(); }, function (currentUser) {
-    $scope.user = currentUser;
-    $scope.loading = false;
-  }, true);
+function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, PlanService, ApiService) {
+  UserService.updateUserIn($scope);
 
-  requested = $routeParams['plan'];
+  var requested = $routeParams['plan'];
 
   // Load the list of plans.
   PlanService.getPlans(function(plans) {
-    $scope.plans = plans.business;
+    $scope.plans = plans;
     $scope.currentPlan = null;
     if (requested) {
       PlanService.getPlan(requested, function(plan) {
@@ -1315,15 +1601,14 @@ function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, Plan
       'email': org.email
     };
 
-    var createPost = Restangular.one('organization/');
-    createPost.customPOST(data).then(function(created) {
-      $scope.creating = false;
+    ApiService.createOrganization(data).then(function(created) {
       $scope.created = created;
 
       // Reset the organizations list.
       UserService.load();
 
       var showOrg = function() {
+        $scope.creating = false;
         $location.path('/organization/' + org.name + '/');
       };
 
@@ -1334,6 +1619,7 @@ function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, Plan
       }
 
       // Otherwise, show the subscribe for the plan.
+      $scope.creating = true;
       var callbacks = {
         'opened': function() { $scope.creating = true; },
         'closed': showOrg,
@@ -1341,7 +1627,7 @@ function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, Plan
         'failure': showOrg
       };
 
-      PlanService.changePlan($scope, org.name, $scope.currentPlan.stripeId, false, callbacks);
+      PlanService.changePlan($scope, org.name, $scope.currentPlan.stripeId, callbacks);
     }, function(result) {
       $scope.creating = false;
       $scope.createError = result.data.message || result.data;
@@ -1353,49 +1639,43 @@ function NewOrgCtrl($scope, $routeParams, $timeout, $location, UserService, Plan
 }
 
 
-function OrgMemberLogsCtrl($scope, $routeParams, $rootScope, $timeout, Restangular) {
+function OrgMemberLogsCtrl($scope, $routeParams, $rootScope, $timeout, Restangular, ApiService) {
   var orgname = $routeParams.orgname;
   var membername = $routeParams.membername;
 
   $scope.orgname = orgname;
-  $scope.loading = true;
   $scope.memberInfo = null;
   $scope.ready = false;
 
-  var checkReady = function() {
-    $scope.loading = !$scope.organization || !$scope.memberInfo;
-    if (!$scope.loading) {
-      $rootScope.title = 'Logs for ' + $scope.memberInfo.username + ' (' + $scope.orgname + ')';
-      $rootScope.description = 'Shows all the actions of ' + $scope.memberInfo.username +
-         ' under organization ' + $scope.orgname;
-      $timeout(function() {
-        $scope.ready = true;
-      });
-    }
-  };
-
   var loadOrganization = function() {
-    var getOrganization = Restangular.one(getRestUrl('organization', orgname))
-    getOrganization.get().then(function(resp) {
-      $scope.organization = resp;
-      checkReady();
-    }, function() {
-      $scope.organization = null;
-      $scope.loading = false;
+    $scope.orgResource = ApiService.getOrganizationAsResource({'orgname': orgname}).get(function(org) {
+      $scope.organization = org;
+      return org;
     });
   };
 
   var loadMemberInfo = function() {
-    var getMemberInfo = Restangular.one(getRestUrl('organization', orgname, 'members', membername))
-    getMemberInfo.get().then(function(resp) {
+    var params = {
+      'orgname': orgname,
+      'membername': membername
+    };
+
+    $scope.memberResource = ApiService.getOrganizationMemberAsResource(params).get(function(resp) {
       $scope.memberInfo = resp.member;
-      checkReady();
-    }, function() {
-      $scope.memberInfo = null;
-      $scope.loading = false;
-    });
+
+      $rootScope.title = 'Logs for ' + $scope.memberInfo.username + ' (' + $scope.orgname + ')';
+      $rootScope.description = 'Shows all the actions of ' + $scope.memberInfo.username +
+         ' under organization ' + $scope.orgname;
+
+      $timeout(function() {
+        $scope.ready = true;
+      });
+
+      return resp.member;
+    });   
   };
 
+  // Load the org info and the member info.
   loadOrganization();
   loadMemberInfo();
 }
\ No newline at end of file
diff --git a/static/js/graphing.js b/static/js/graphing.js
index d92a6bfa3..396228ab0 100644
--- a/static/js/graphing.js
+++ b/static/js/graphing.js
@@ -1,10 +1,37 @@
+/**
+ * Bind polyfill from https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Function/bind#Compatibility
+ */
+if (!Function.prototype.bind) {
+  Function.prototype.bind = function (oThis) {
+    if (typeof this !== "function") {
+      // closest thing possible to the ECMAScript 5 internal IsCallable function
+      throw new TypeError("Function.prototype.bind - what is trying to be bound is not callable");
+    }
+
+    var aArgs = Array.prototype.slice.call(arguments, 1), 
+        fToBind = this, 
+        fNOP = function () {},
+        fBound = function () {
+          return fToBind.apply(this instanceof fNOP && oThis
+                                 ? this
+                                 : oThis,
+                               aArgs.concat(Array.prototype.slice.call(arguments)));
+        };
+
+    fNOP.prototype = this.prototype;
+    fBound.prototype = new fNOP();
+
+    return fBound;
+  };
+}
+
 var DEPTH_HEIGHT = 100;
 var DEPTH_WIDTH = 132;
 
 /**
  * Based off of http://mbostock.github.io/d3/talk/20111018/tree.html by Mike Bostock (@mbostock)
  */
-function ImageHistoryTree(namespace, name, images, formatComment, formatTime) {
+function ImageHistoryTree(namespace, name, images, formatComment, formatTime, formatCommand) {
     /**
      * The namespace of the repo.
      */
@@ -30,6 +57,11 @@ function ImageHistoryTree(namespace, name, images, formatComment, formatTime) {
      */
     this.formatTime_ = formatTime;
 
+    /**
+     * Method to invoke to format the command for an image.
+     */
+    this.formatCommand_ = formatCommand;
+
     /**
      * The current tag (if any).
      */
@@ -40,6 +72,11 @@ function ImageHistoryTree(namespace, name, images, formatComment, formatTime) {
      */
     this.currentImage_ = null;
 
+    /**
+     * The currently highlighted node (if any).
+     */
+    this.currentNode_ = null;
+
     /**
      * Counter for creating unique IDs.
      */
@@ -54,7 +91,7 @@ ImageHistoryTree.prototype.calculateDimensions_ = function(container) {
     var cw = Math.max(document.getElementById(container).clientWidth, this.maxWidth_ * DEPTH_WIDTH);
     var ch = this.maxHeight_ * (DEPTH_HEIGHT + 10);
 
-    var margin = { top: 40, right: 20, bottom: 20, left: 40 };
+    var margin = { top: 40, right: 20, bottom: 20, left: 80 };
     var m = [margin.top, margin.right, margin.bottom, margin.left];
     var w = cw - m[1] - m[3];
     var h = ch - m[0] - m[2];
@@ -69,6 +106,25 @@ ImageHistoryTree.prototype.calculateDimensions_ = function(container) {
 };
 
 
+ImageHistoryTree.prototype.setupOverscroll_ = function() {
+  var container = this.container_;
+  var that = this;
+  var overscroll = $('#' + container).overscroll();
+
+  overscroll.on('overscroll:dragstart', function() {
+    $(that).trigger({
+      'type': 'hideTagMenu'
+    });
+  });
+
+  overscroll.on('scroll', function() {
+    $(that).trigger({
+      'type': 'hideTagMenu'
+    });
+  });
+};
+
+
 /**
  * Updates the dimensions of the tree.
  */
@@ -86,17 +142,22 @@ ImageHistoryTree.prototype.updateDimensions_ = function() {
     $('#' + container).removeOverscroll();
     var viewportHeight = $(window).height();
     var boundingBox = document.getElementById(container).getBoundingClientRect();
-    document.getElementById(container).style.maxHeight = (viewportHeight - boundingBox.top - 110) + 'px';
-    $('#' + container).overscroll();
+    document.getElementById(container).style.maxHeight = (viewportHeight - boundingBox.top - 150) + 'px';
 
+    this.setupOverscroll_();
+                                                                        
     // Update the tree.
     var rootSvg = this.rootSvg_;
     var tree = this.tree_;
     var vis = this.vis_;
 
+
+    var ow = w + m[1] + m[3];
+    var oh = h + m[0] + m[2];
     rootSvg
-        .attr("width", w + m[1] + m[3])
-        .attr("height", h + m[0] + m[2]);
+        .attr("width", ow)
+        .attr("height", oh)
+        .attr("style", "width: " + ow + "px; height: " + oh + "px");
 
     tree.size([w, h]);
     vis.attr("transform", "translate(" + m[3] + "," + m[0] + ")");
@@ -131,6 +192,8 @@ ImageHistoryTree.prototype.draw = function(container) {
 
     var formatComment = this.formatComment_;
     var formatTime = this.formatTime_;
+    var formatCommand = this.formatCommand_;
+
     var tip = d3.tip()
         .attr('class', 'd3-tip')
         .offset([-1, 24])
@@ -156,8 +219,10 @@ ImageHistoryTree.prototype.draw = function(container) {
             if (d.image.comment) {
                 html += '<span class="comment">' + formatComment(d.image.comment) + '</span>';
             }
-            html += '<span class="created">' + formatTime(d.image.created) + '</span>';
-            html += '<span class="full-id">' + d.image.id + '</span>';
+            if (d.image.command && d.image.command.length) {
+                html += '<span class="command info-line"><i class="fa fa-terminal"></i>' + formatCommand(d.image) + '</span>';
+            }
+            html += '<span class="created info-line"><i class="fa fa-calendar"></i>' + formatTime(d.image.created) + '</span>';           
             return html;
         })
 
@@ -178,8 +243,7 @@ ImageHistoryTree.prototype.draw = function(container) {
     this.root_.y0 = 0;
 
     this.setTag_(this.currentTag_);
-
-    $('#' + container).overscroll();
+    this.setupOverscroll_();
 };
 
 
@@ -208,6 +272,23 @@ ImageHistoryTree.prototype.setImage = function(imageId) {
 };
 
 
+/**
+ * Updates the highlighted path in the tree.
+ */
+ImageHistoryTree.prototype.setHighlightedPath_ = function(image) {
+  if (this.currentNode_) {
+    this.markPath_(this.currentNode_, false);
+  }
+
+  var imageByDBID = this.imageByDBID_;
+  var currentNode = imageByDBID[image.dbid];
+  if (currentNode) {
+    this.markPath_(currentNode, true);
+    this.currentNode_ = currentNode;
+  }
+};
+
+
 /**
  * Returns the ancestors of the given image.
  */
@@ -445,26 +526,15 @@ ImageHistoryTree.prototype.setTag_ = function(tagName) {
     // Save the current tag.
     var previousTagName = this.currentTag_;
     this.currentTag_ = tagName;
+    this.currentImage_ = null;
    
-    // Update the state of each existing node to no longer be highlighted.
-    var previousImage = this.findImage_(function(image) {
-      return image.tags.indexOf(previousTagName || '(no tag specified)') >= 0;
-    });
-
-    if (previousImage) {
-      var currentNode = imageByDBID[previousImage.dbid];
-      this.markPath_(currentNode, false);
-    }
-
-    // Find the new current image (if any).
-    this.currentImage_ = this.findImage_(function(image) {
+    // Update the path.
+    var tagImage = this.findImage_(function(image) {
       return image.tags.indexOf(tagName || '(no tag specified)') >= 0;
     });
 
-    // Update the state of the new node path.
-    if (this.currentImage_) {
-      var currentNode = imageByDBID[this.currentImage_.dbid];
-      this.markPath_(currentNode, true);
+    if (tagImage) {
+      this.setHighlightedPath_(tagImage);
     }
 
     // Ensure that the children are in the correct order.
@@ -508,7 +578,9 @@ ImageHistoryTree.prototype.setImage_ = function(imageId) {
         return;
     }
 
+    this.setHighlightedPath_(newImage);
     this.currentImage_ = newImage;
+    this.currentTag_ = null;
     this.update_(this.root_);
 };
 
@@ -637,7 +709,7 @@ ImageHistoryTree.prototype.update_ = function(source) {
               if (tag == currentTag) {
                   kind = 'success';
               }
-              html += '<span class="label label-' + kind + ' tag" data-tag="' + tag + '">' + tag + '</span>';
+              html += '<span class="label label-' + kind + ' tag" data-tag="' + tag + '"">' + tag + '</span>';
           }
           return html;
       });
@@ -649,6 +721,19 @@ ImageHistoryTree.prototype.update_ = function(source) {
           if (tag) {
               that.changeTag_(tag);
           }
+      })
+      .on("contextmenu", function(d, e) {
+        d3.event.preventDefault();
+
+        var tag = this.getAttribute('data-tag');
+        if (tag) {
+          $(that).trigger({
+            'type': 'showTagMenu',
+            'tag': tag,
+            'clientX': d3.event.clientX,
+            'clientY': d3.event.clientY
+          });
+        }
       });
 
   // Ensure the tags are visible.
diff --git a/static/lib/angulartics-google-analytics.js b/static/lib/angulartics-google-analytics.js
new file mode 100644
index 000000000..bea8f5be4
--- /dev/null
+++ b/static/lib/angulartics-google-analytics.js
@@ -0,0 +1,32 @@
+/**
+ * @license Angulartics v0.8.5
+ * (c) 2013 Luis Farzati http://luisfarzati.github.io/angulartics
+ * Universal Analytics update contributed by http://github.com/willmcclellan
+ * License: MIT
+ */
+(function(angular) {
+'use strict';
+
+/**
+ * @ngdoc overview
+ * @name angulartics.google.analytics
+ * Enables analytics support for Google Analytics (http://google.com/analytics)
+ */
+angular.module('angulartics.google.analytics', ['angulartics'])
+.config(['$analyticsProvider', function ($analyticsProvider) {
+
+  // GA already supports buffered invocations so we don't need
+  // to wrap these inside angulartics.waitForVendorApi
+
+  $analyticsProvider.registerPageTrack(function (path) {
+    if (window._gaq) _gaq.push(['_trackPageview', path]);
+    if (window.ga) ga('send', 'pageview', path);
+  });
+
+  $analyticsProvider.registerEventTrack(function (action, properties) {
+    if (window._gaq) _gaq.push(['_trackEvent', properties.category, action, properties.label, properties.value]);
+    if (window.ga) ga('send', 'event', properties.category, action, properties.label, properties.value);
+  });
+  
+}]);
+})(angular);
\ No newline at end of file
diff --git a/static/lib/jquery.overscroll.js b/static/lib/jquery.overscroll.js
new file mode 100644
index 000000000..7126a8b1e
--- /dev/null
+++ b/static/lib/jquery.overscroll.js
@@ -0,0 +1,793 @@
+/**
+ * Overscroll v1.7.3
+ *  A jQuery Plugin that emulates the iPhone scrolling experience in a browser.
+ *  http://azoffdesign.com/overscroll
+ *
+ * Intended for use with the latest jQuery
+ *  http://code.jquery.com/jquery-latest.js
+ *  
+ * Copyright 2013, Jonathan Azoff
+ * Licensed under the MIT license.
+ *  https://github.com/azoff/overscroll/blob/master/mit.license
+ *
+ * For API documentation, see the README file
+ *  http://azof.fr/pYCzuM
+ *
+ * Date: Tuesday, March 18th 2013
+ */
+(function(global, dom, browser, math, wait, cancel, namespace, $, none){
+
+	// We want to run this plug-in in strict-mode
+	// so that we may benefit from its optimizations
+	'use strict';
+
+	// The key used to bind-instance specific data to an object
+	var datakey = 'overscroll';
+
+    // create <body> node if there's not one present (e.g., for test runners)
+	if (dom.body === null) {
+		dom.documentElement.appendChild(
+			dom.createElement('body')
+		);
+	}
+
+	// quick fix for IE 8 and below since getComputedStyle() is not supported
+	// TODO: find a better solution
+	if (!global.getComputedStyle) {
+		global.getComputedStyle = function (el, pseudo) {
+			this.el = el;
+			this.getPropertyValue = function (prop) {
+				var re = /(\-([a-z]){1})/g;
+				if (prop == 'float') prop = 'styleFloat';
+				if (re.test(prop)) {
+					prop = prop.replace(re, function () {
+						return arguments[2].toUpperCase();
+					});
+				}
+				return el.currentStyle[prop] ? el.currentStyle[prop] : null;
+			};
+			return this;
+		};
+	}
+
+	// runs feature detection for overscroll
+	var compat = {
+		animate: (function(){
+			var fn = global.requestAnimationFrame    ||
+				global.webkitRequestAnimationFrame ||
+				global.mozRequestAnimationFrame    ||
+				global.oRequestAnimationFrame      ||
+				global.msRequestAnimationFrame     ||
+				function(callback) { wait(callback, 1000/60); };
+			return function(callback) {
+				fn.call(global, callback);
+			};
+		})(),
+		overflowScrolling: (function(){
+			var style = '';
+			var div = dom.createElement('div');
+			var prefixes = ['webkit', 'moz', 'o', 'ms'];
+			dom.body.appendChild(div);
+			$.each(prefixes, function(i, prefix){
+				div.style[prefix + 'OverflowScrolling'] = 'touch';
+			});
+			div.style.overflowScrolling = 'touch';
+			var computedStyle = global.getComputedStyle(div);
+			if (!!computedStyle.overflowScrolling) {
+				style = 'overflow-scrolling';
+			} else {
+				$.each(prefixes, function(i, prefix){
+					if (!!computedStyle[prefix + 'OverflowScrolling']) {
+						style = '-' + prefix + '-overflow-scrolling';
+					}
+					return !style;
+				});
+			}
+			div.parentNode.removeChild(div);
+			return style;
+		})(),
+		cursor: (function() {
+			var div = dom.createElement('div');
+			var prefixes = ['webkit', 'moz'];
+			var gmail = 'https://mail.google.com/mail/images/2/';
+			var style = {
+				grab:     'url('+gmail+'openhand.cur), move',
+				grabbing: 'url('+gmail+'closedhand.cur), move'
+			};
+			dom.body.appendChild(div);
+			$.each(prefixes, function(i, prefix){
+				var found, cursor = '-' + prefix + '-grab';
+				div.style.cursor = cursor;
+				var computedStyle = global.getComputedStyle(div);
+				found = computedStyle.cursor === cursor;
+				if (found) {
+					style = {
+						grab:     '-' + prefix + '-grab',
+						grabbing: '-' + prefix + '-grabbing'
+					};
+				}
+				return !found;
+			});
+			div.parentNode.removeChild(div);
+			return style;
+		})()
+	};
+
+	// These are all the events that could possibly
+	// be used by the plug-in
+	var events = {
+		drag:       'mousemove touchmove',
+		end:        'mouseup mouseleave click touchend touchcancel',
+		hover:      'mouseenter mouseleave',
+		ignored:    'select dragstart drag',
+		scroll:     'scroll',
+		start:      'mousedown touchstart',
+		wheel:      'mousewheel DOMMouseScroll'
+	};
+
+	// These settings are used to tweak drift settings
+	// for the plug-in
+	var settings = {
+		captureThreshold:   3,
+		driftDecay:         1.1,
+		driftSequences:     22,
+		driftTimeout:       100,
+		scrollDelta:        15,
+		thumbOpacity:       0.7,
+		thumbThickness:     6,
+		thumbTimeout:       400,
+		wheelDelta:         20,
+		wheelTicks:        120
+	};
+
+	// These defaults are used to complement any options
+	// passed into the plug-in entry point
+	var defaults = {
+		cancelOn:       'select,input,textarea',
+		direction:      'multi',
+		dragHold:       false,
+		hoverThumbs:    false,
+		scrollDelta:    settings.scrollDelta,
+		showThumbs:     true,
+		persistThumbs:  false,
+		captureWheel:   true,
+		wheelDelta:     settings.wheelDelta,
+		wheelDirection: 'multi',
+		zIndex:         999,
+		ignoreSizing:	false
+	};
+
+	// Triggers a DOM event on the overscrolled element.
+	// All events are namespaced under the overscroll name
+	function triggerEvent(event, target) {
+		target.trigger('overscroll:' + event);
+	}
+
+	// Utility function to return a timestamp
+	function time() {
+		return (new Date()).getTime();
+	}
+
+	// Captures the position from an event, modifies the properties
+	// of the second argument to persist the position, and then
+	// returns the modified object
+	function capturePosition(event, position, index) {
+		position.x = event.pageX;
+		position.y = event.pageY;
+		position.time = time();
+		position.index = index;
+		return position;
+	}
+
+	// Used to move the thumbs around an overscrolled element
+	function moveThumbs(thumbs, sizing, left, top) {
+
+		var ml, mt;
+
+		if (thumbs && thumbs.added) {
+			if (thumbs.horizontal) {
+				ml = left * (1 + sizing.container.width / sizing.container.scrollWidth);
+				mt = top + sizing.thumbs.horizontal.top;
+				thumbs.horizontal.css('margin', mt + 'px 0 0 ' + ml + 'px');
+			}
+			if (thumbs.vertical) {
+				ml = left + sizing.thumbs.vertical.left;
+				mt = top * (1 + sizing.container.height / sizing.container.scrollHeight);
+				thumbs.vertical.css('margin', mt + 'px 0 0 ' + ml + 'px');
+			}
+		}
+
+	}
+
+	// Used to toggle the thumbs on and off
+	// of an overscrolled element
+	function toggleThumbs(thumbs, options, dragging) {
+		if (thumbs && thumbs.added && !options.persistThumbs) {
+			if (dragging) {
+				if (thumbs.vertical) {
+					thumbs.vertical.stop(true, true).fadeTo('fast', settings.thumbOpacity);
+				}
+				if (thumbs.horizontal) {
+					thumbs.horizontal.stop(true, true).fadeTo('fast', settings.thumbOpacity);
+				}
+			} else {
+				if (thumbs.vertical) {
+					thumbs.vertical.fadeTo('fast', 0);
+				}
+				if (thumbs.horizontal) {
+					thumbs.horizontal.fadeTo('fast', 0);
+				}
+			}
+		}
+	}
+
+	// Defers click event listeners to after a mouseup event.
+	// Used to avoid unintentional clicks
+	function deferClick(target) {
+		var clicks, key = 'events';
+		var events = $._data ? $._data(target[0], key) : target.data(key);
+		if (events && events.click) {
+			clicks = events.click.slice();
+			target.off('click').one('click', function(){
+				$.each(clicks, function(i, click){
+					target.click(click);
+				}); return false;
+			});
+		}
+	}
+
+	// Toggles thumbs on hover. This event is only triggered
+	// if the hoverThumbs option is set
+	function hover(event) {
+		var data = event.data,
+		thumbs   = data.thumbs,
+		options  = data.options,
+		dragging = event.type === 'mouseenter';
+		toggleThumbs(thumbs, options, dragging);
+	}
+
+	// This function is only ever used when the overscrolled element
+	// scrolled outside of the scope of this plugin.
+	function scroll(event) {
+		var data = event.data;
+		if (!data.flags.dragged) {
+			/*jshint validthis:true */
+			moveThumbs(data.thumbs, data.sizing, this.scrollLeft, this.scrollTop);
+		}
+	}
+
+	// handles mouse wheel scroll events
+	function wheel(event) {
+
+		// prevent any default wheel behavior
+		event.preventDefault();
+
+		var data = event.data,
+		options = data.options,
+		sizing = data.sizing,
+		thumbs = data.thumbs,
+		dwheel = data.wheel,
+		flags = data.flags,
+		original = event.originalEvent,
+		delta = 0, deltaX = 0, deltaY = 0;
+
+		// stop any drifts
+		flags.drifting = false;
+
+		// normalize the wheel ticks
+		if (original.detail) {
+			delta = -original.detail;
+			if (original.detailX) {
+				deltaX = -original.detailX;
+			}
+			if (original.detailY) {
+				deltaY = -original.detailY;
+			}
+		} else if (original.wheelDelta) {
+			delta = original.wheelDelta / settings.wheelTicks;
+			if (original.wheelDeltaX) {
+				deltaX = original.wheelDeltaX / settings.wheelTicks;
+			}
+			if (original.wheelDeltaY) {
+				deltaY = original.wheelDeltaY / settings.wheelTicks;
+			}
+		}
+
+		// apply a pixel delta to each tick
+		delta  *= options.wheelDelta;
+		deltaX *= options.wheelDelta;
+		deltaY *= options.wheelDelta;
+
+		// initialize flags if this is the first tick
+		if (!dwheel) {
+			data.target.data(datakey).dragging = flags.dragging = true;
+			data.wheel = dwheel = { timeout: null };
+			toggleThumbs(thumbs, options, true);
+		}
+
+		// actually modify scroll offsets
+		if (options.wheelDirection === 'vertical'){
+			/*jshint validthis:true */
+			this.scrollTop -= delta;
+		} else if ( options.wheelDirection === 'horizontal') {
+			this.scrollLeft -= delta;
+		} else {
+			this.scrollLeft -= deltaX;
+			this.scrollTop  -= deltaY || delta;
+		}
+
+		if (dwheel.timeout) { cancel(dwheel.timeout); }
+
+		moveThumbs(thumbs, sizing, this.scrollLeft, this.scrollTop);
+
+		dwheel.timeout = wait(function() {
+			data.target.data(datakey).dragging = flags.dragging = false;
+			toggleThumbs(thumbs, options, data.wheel = null);
+		}, settings.thumbTimeout);
+
+	}
+
+	// updates the current scroll offset during a mouse move
+	function drag(event) {
+
+		event.preventDefault();
+
+		var data = event.data,
+		touches  = event.originalEvent.touches,
+		options  = data.options,
+		sizing   = data.sizing,
+		thumbs   = data.thumbs,
+		position = data.position,
+		flags    = data.flags,
+		target   = data.target.get(0);
+
+
+		// correct page coordinates for touch devices
+		if (touches && touches.length) {
+			event = touches[0];
+		}
+
+		if (!flags.dragged) {
+			toggleThumbs(thumbs, options, true);
+		}
+
+		flags.dragged = true;
+
+		if (options.direction !== 'vertical') {
+			target.scrollLeft -= (event.pageX - position.x);
+		}
+
+		if (data.options.direction !== 'horizontal') {
+			target.scrollTop -= (event.pageY - position.y);
+		}
+
+		capturePosition(event, data.position);
+
+		if (--data.capture.index <= 0) {
+			data.target.data(datakey).dragging = flags.dragging = true;
+			capturePosition(event, data.capture, settings.captureThreshold);
+		}
+
+		moveThumbs(thumbs, sizing, target.scrollLeft, target.scrollTop);
+
+	}
+
+	// sends the overscrolled element into a drift
+	function drift(target, event, callback) {
+
+		var data   = event.data, dx, dy, xMod, yMod,
+		capture    = data.capture,
+		options    = data.options,
+		sizing     = data.sizing,
+		thumbs     = data.thumbs,
+		elapsed    = time() - capture.time,
+		scrollLeft = target.scrollLeft,
+		scrollTop  = target.scrollTop,
+		decay      = settings.driftDecay;
+
+		// only drift if enough time has passed since
+		// the last capture event
+		if (elapsed > settings.driftTimeout) {
+			callback(data); return;
+		}
+
+		// determine offset between last capture and current time
+		dx = options.scrollDelta * (event.pageX - capture.x);
+		dy = options.scrollDelta * (event.pageY - capture.y);
+
+		// update target scroll offsets
+		if (options.direction !== 'vertical') {
+			scrollLeft -= dx;
+		} if (options.direction !== 'horizontal') {
+			scrollTop -= dy;
+		}
+
+		// split the distance to travel into a set of sequences
+		xMod = dx / settings.driftSequences;
+		yMod = dy / settings.driftSequences;
+
+		triggerEvent('driftstart', data.target);
+
+		data.drifting = true;
+
+		// animate the drift sequence
+		compat.animate(function render() {
+			if (data.drifting) {
+				var min = 1, max = -1;
+				data.drifting = false;
+				if (yMod > min && target.scrollTop > scrollTop || yMod < max && target.scrollTop < scrollTop) {
+					data.drifting = true;
+					target.scrollTop -= yMod;
+					yMod /= decay;
+				}
+				if (xMod > min && target.scrollLeft > scrollLeft || xMod < max && target.scrollLeft < scrollLeft) {
+					data.drifting = true;
+					target.scrollLeft -= xMod;
+					xMod /= decay;
+				}
+				moveThumbs(thumbs, sizing, target.scrollLeft, target.scrollTop);
+				compat.animate(render);
+			} else {
+				triggerEvent('driftend', data.target);
+				callback(data);
+			}
+		});
+
+	}
+
+	// starts the drag operation and binds the mouse move handler
+	function start(event) {
+
+		var data = event.data,
+		touches  = event.originalEvent.touches,
+		target   = data.target,
+		dstart   = data.start = $(event.target),
+		flags    = data.flags;
+
+		// stop any drifts
+		flags.drifting = false;
+
+		// only start drag if the user has not explictly banned it.
+		if (dstart.size() && !dstart.is(data.options.cancelOn)) {
+
+			// without this the simple "click" event won't be recognized on touch clients
+			if (!touches) { event.preventDefault(); }
+
+			if (!compat.overflowScrolling) {
+				target.css('cursor', compat.cursor.grabbing);
+				target.data(datakey).dragging = flags.dragging = flags.dragged = false;
+
+				// apply the drag listeners to the doc or target
+				if(data.options.dragHold) {
+					$(document).on(events.drag, data, drag);
+				} else {
+					target.on(events.drag, data, drag);
+				}
+			}
+
+			data.position = capturePosition(event, {});
+			data.capture = capturePosition(event, {}, settings.captureThreshold);
+			triggerEvent('dragstart', target);
+
+		}
+
+	}
+
+	// ends the drag operation and unbinds the mouse move handler
+	function stop(event) {
+
+		var data = event.data,
+		target = data.target,
+		options = data.options,
+		flags = data.flags,
+		thumbs = data.thumbs,
+
+		// hides the thumbs after the animation is done
+		done = function () {
+			if (thumbs && !options.hoverThumbs) {
+				toggleThumbs(thumbs, options, false);
+			}
+		};
+
+		// remove drag listeners from doc or target
+		if(options.dragHold) {
+			$(document).unbind(events.drag, drag);
+		} else {
+			target.unbind(events.drag, drag);
+		}
+
+		// only fire events and drift if we started with a
+		// valid position
+		if (data.position) {
+
+			triggerEvent('dragend', target);
+
+			// only drift if a drag passed our threshold
+			if (flags.dragging && !compat.overflowScrolling) {
+				drift(target.get(0), event, done);
+			} else {
+				done();
+			}
+
+		}
+
+		// only if we moved, and the mouse down is the same as
+		// the mouse up target do we defer the event
+		if (flags.dragging && !compat.overflowScrolling && data.start && data.start.is(event.target)) {
+			deferClick(data.start);
+		}
+
+		// clear all internal flags and settings
+		target.data(datakey).dragging =
+			data.start     =
+			data.capture   =
+			data.position  =
+			flags.dragged  =
+			flags.dragging = false;
+
+		// set the cursor back to normal
+		target.css('cursor', compat.cursor.grab);
+
+	}
+
+	// Ensures that a full set of options are provided
+	// for the plug-in. Also does some validation
+	function getOptions(options) {
+
+		// fill in missing values with defaults
+		options = $.extend({}, defaults, options);
+
+		// check for inconsistent directional restrictions
+		if (options.direction !== 'multi' && options.direction !== options.wheelDirection) {
+			options.wheelDirection = options.direction;
+		}
+
+		// ensure positive values for deltas
+		options.scrollDelta = math.abs(parseFloat(options.scrollDelta));
+		options.wheelDelta  = math.abs(parseFloat(options.wheelDelta));
+
+		// fix values for scroll offset
+		options.scrollLeft = options.scrollLeft === none ? null : math.abs(parseFloat(options.scrollLeft));
+		options.scrollTop  = options.scrollTop  === none ? null : math.abs(parseFloat(options.scrollTop));
+
+		return options;
+
+	}
+
+	// Returns the sizing information (bounding box) for the
+	// target DOM element
+	function getSizing(target) {
+
+		var $target  = $(target),
+		width        = $target.width(),
+		height       = $target.height(),
+		scrollWidth  = width >= target.scrollWidth ? width : target.scrollWidth,
+		scrollHeight = height >= target.scrollHeight ? height : target.scrollHeight,
+		hasScroll    = scrollWidth > width || scrollHeight > height;
+
+		return {
+			valid: hasScroll,
+			container: {
+				width: width,
+				height: height,
+				scrollWidth: scrollWidth,
+				scrollHeight: scrollHeight
+			},
+			thumbs: {
+				horizontal: {
+					width: width * width / scrollWidth,
+					height: settings.thumbThickness,
+					corner: settings.thumbThickness / 2,
+					left: 0,
+					top: height - settings.thumbThickness
+				},
+				vertical: {
+					width: settings.thumbThickness,
+					height: height * height / scrollHeight,
+					corner: settings.thumbThickness / 2,
+					left: width - settings.thumbThickness,
+					top: 0
+				}
+			}
+		};
+
+	}
+
+	// Attempts to get (or implicitly creates) the
+	// remover function for the target passed
+	// in as an argument
+	function getRemover(target, orCreate) {
+
+		var $target = $(target), thumbs,
+		data        = $target.data(datakey) || {},
+		style       = $target.attr('style'),
+		fallback    = orCreate ? function () {
+
+			data = $target.data(datakey);
+			thumbs = data.thumbs;
+
+			// restore original styles (if any)
+			if (style) {
+				$target.attr('style', style);
+			} else {
+				$target.removeAttr('style');
+			}
+
+			// remove any created thumbs
+			if (thumbs) {
+				if (thumbs.horizontal) { thumbs.horizontal.remove(); }
+				if (thumbs.vertical)   { thumbs.vertical.remove();   }
+			}
+
+			// remove any bound overscroll events and data
+			$target
+				.removeData(datakey)
+				.off(events.wheel,      wheel)
+				.off(events.start,      start)
+				.off(events.end,        stop)
+				.off(events.ignored,    ignore);
+
+		} : $.noop;
+
+		return $.isFunction(data.remover) ? data.remover : fallback;
+
+	}
+
+	// Genterates CSS specific to a particular thumb.
+	// It requires sizing data and options
+	function getThumbCss(size, options) {
+		return {
+			position: 'absolute',
+			opacity: options.persistThumbs ? settings.thumbOpacity : 0,
+			'background-color': 'black',
+			width: size.width + 'px',
+			height: size.height + 'px',
+			'border-radius': size.corner + 'px',
+			'margin': size.top + 'px 0 0 ' + size.left + 'px',
+			'z-index': options.zIndex
+		};
+	}
+
+	// Creates the DOM elements used as "thumbs" within
+	// the target container.
+	function createThumbs(target, sizing, options) {
+
+		var div = '<div/>',
+		thumbs  = {},
+		css     = false;
+
+		if (sizing.container.scrollWidth > 0 && options.direction !== 'vertical') {
+			css = getThumbCss(sizing.thumbs.horizontal, options);
+			thumbs.horizontal = $(div).css(css).prependTo(target);
+		}
+
+		if (sizing.container.scrollHeight > 0 && options.direction !== 'horizontal') {
+			css = getThumbCss(sizing.thumbs.vertical, options);
+			thumbs.vertical = $(div).css(css).prependTo(target);
+		}
+
+		thumbs.added = !!css;
+
+		return thumbs;
+
+	}
+
+	// ignores events on the overscroll element
+	function ignore(event) {
+		event.preventDefault();
+	}
+
+	// This function takes a jQuery element, some
+	// (optional) options, and sets up event metadata
+	// for each instance the plug-in affects
+	function setup(target, options) {
+
+		// create initial data properties for this instance
+		options = getOptions(options);
+		var sizing = getSizing(target),
+		thumbs, data = {
+			options: options, sizing: sizing,
+			flags: { dragging: false },
+			remover: getRemover(target, true)
+		};
+
+		// only apply handlers if the overscrolled element
+		// actually has an area to scroll
+		if (sizing.valid || options.ignoreSizing) {
+			// provide a circular-reference, enable events, and
+			// apply any required CSS
+			data.target = target = $(target).css({
+				position: 'relative',
+				cursor: compat.cursor.grab
+			}).on(events.start, data, start)
+				.on(events.end, data, stop)
+				.on(events.ignored, data, ignore);
+
+			// apply the stop listeners for drag end
+			if(options.dragHold) {
+				$(document).on(events.end, data, stop);
+			} else {
+				data.target.on(events.end, data, stop);
+			}
+
+			// apply any user-provided scroll offsets
+			if (options.scrollLeft !== null) {
+				target.scrollLeft(options.scrollLeft);
+			} if (options.scrollTop !== null) {
+				target.scrollTop(options.scrollTop);
+			}
+
+			// use native oversroll, if it exists
+			if (compat.overflowScrolling) {
+				target.css(compat.overflowScrolling, 'touch');
+			} else {
+				target.on(events.scroll, data, scroll);
+			}
+
+			// check to see if the user would like mousewheel support
+			if (options.captureWheel) {
+				target.on(events.wheel, data, wheel);
+			}
+
+			// add thumbs and listeners (if we're showing them)
+			if (options.showThumbs) {
+				if (compat.overflowScrolling) {
+					target.css('overflow', 'scroll');
+				} else {
+					target.css('overflow', 'hidden');
+					data.thumbs = thumbs = createThumbs(target, sizing, options);
+					if (thumbs.added) {
+						moveThumbs(thumbs, sizing, target.scrollLeft(), target.scrollTop());
+						if (options.hoverThumbs) {
+							target.on(events.hover, data, hover);
+						}
+					}
+				}
+			} else {
+				target.css('overflow', 'hidden');
+			}
+
+			target.data(datakey, data);
+		}
+
+	}
+
+	// Removes any event listeners and other instance-specific
+	// data from the target. It attempts to leave the target
+	// at the state it found it.
+	function teardown(target) {
+		getRemover(target)();
+	}
+
+	// This is the entry-point for enabling the plug-in;
+	// You can find it's exposure point at the end
+	// of this closure
+	function overscroll(options) {
+		/*jshint validthis:true */
+		return this.removeOverscroll().each(function() {
+			setup(this, options);
+		});
+	}
+
+	// This is the entry-point for disabling the plug-in;
+	// You can find it's exposure point at the end
+	// of this closure
+	function removeOverscroll() {
+		/*jshint validthis:true */
+		return this.each(function () {
+			teardown(this);
+		});
+	}
+
+	// Extend overscroll to expose settings to the user
+	overscroll.settings = settings;
+
+	// Extend jQuery's prototype to expose the plug-in.
+	// If the supports native overflowScrolling, overscroll will not
+	// attempt to override the browser's built in support
+	$.extend(namespace, {
+		overscroll:         overscroll,
+		removeOverscroll:   removeOverscroll
+	});
+
+})(window, document, navigator, Math, setTimeout, clearTimeout, jQuery.fn, jQuery);
diff --git a/static/lib/loading-bar.css b/static/lib/loading-bar.css
new file mode 100755
index 000000000..7d2e88e16
--- /dev/null
+++ b/static/lib/loading-bar.css
@@ -0,0 +1,102 @@
+
+/* Make clicks pass-through */
+#loading-bar,
+#loading-bar-spinner {
+  pointer-events: none;
+  -webkit-pointer-events: none;
+  -webkit-transition: 0.5s linear all;
+  -moz-transition: 0.5s linear all;
+  -o-transition: 0.5s linear all;
+  transition: 0.5s linear all;
+}
+
+#loading-bar.ng-enter,
+#loading-bar.ng-leave.ng-leave-active,
+#loading-bar-spinner.ng-enter,
+#loading-bar-spinner.ng-leave.ng-leave-active {
+  opacity: 0;
+}
+
+#loading-bar.ng-enter.ng-enter-active,
+#loading-bar.ng-leave,
+#loading-bar-spinner.ng-enter.ng-enter-active,
+#loading-bar-spinner.ng-leave {
+  opacity: 1;
+}
+
+#loading-bar .bar {
+  -webkit-transition: width 350ms;
+  -moz-transition: width 350ms;
+  -o-transition: width 350ms;
+  transition: width 350ms;
+
+  background: #29d;
+  position: fixed;
+  z-index: 2000;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 2px;
+}
+
+/* Fancy blur effect */
+#loading-bar .peg {
+  display: block;
+  position: absolute;
+  right: 0px;
+  width: 100px;
+  height: 100%;
+  box-shadow: 0 0 10px #29d, 0 0 5px #29d;
+  opacity: 1.0;
+
+  -webkit-transform: rotate(3deg) translate(0px, -4px);
+  -moz-transform: rotate(3deg) translate(0px, -4px);
+  -ms-transform: rotate(3deg) translate(0px, -4px);
+  -o-transform: rotate(3deg) translate(0px, -4px);
+  transform: rotate(3deg) translate(0px, -4px);
+}
+
+#loading-bar-spinner {
+  display: block;
+  position: fixed;
+  z-index: 100;
+  top: 10px;
+  left: 10px;
+}
+
+#loading-bar-spinner .spinner-icon {
+  width: 14px;
+  height: 14px;
+
+  border:  solid 2px transparent;
+  border-top-color:  #29d;
+  border-left-color: #29d;
+  border-radius: 10px;
+
+  -webkit-animation: loading-bar-spinner 400ms linear infinite;
+  -moz-animation:    loading-bar-spinner 400ms linear infinite;
+  -ms-animation:     loading-bar-spinner 400ms linear infinite;
+  -o-animation:      loading-bar-spinner 400ms linear infinite;
+  animation:         loading-bar-spinner 400ms linear infinite;
+}
+
+@-webkit-keyframes loading-bar-spinner {
+  0%   { -webkit-transform: rotate(0deg);   transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-moz-keyframes loading-bar-spinner {
+  0%   { -moz-transform: rotate(0deg);   transform: rotate(0deg); }
+  100% { -moz-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-o-keyframes loading-bar-spinner {
+  0%   { -o-transform: rotate(0deg);   transform: rotate(0deg); }
+  100% { -o-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@-ms-keyframes loading-bar-spinner {
+  0%   { -ms-transform: rotate(0deg);   transform: rotate(0deg); }
+  100% { -ms-transform: rotate(360deg); transform: rotate(360deg); }
+}
+@keyframes loading-bar-spinner {
+  0%   { transform: rotate(0deg);   transform: rotate(0deg); }
+  100% { transform: rotate(360deg); transform: rotate(360deg); }
+}
diff --git a/static/lib/loading-bar.js b/static/lib/loading-bar.js
new file mode 100755
index 000000000..5161dd883
--- /dev/null
+++ b/static/lib/loading-bar.js
@@ -0,0 +1,271 @@
+/*
+ * angular-loading-bar
+ *
+ * intercepts XHR requests and creates a loading bar.
+ * Based on the excellent nprogress work by rstacruz (more info in readme)
+ *
+ * (c) 2013 Wes Cruver
+ * License: MIT
+ */
+
+
+(function() {
+
+'use strict';
+
+// Alias the loading bar so it can be included using a simpler
+// (and maybe more professional) module name:
+angular.module('angular-loading-bar', ['chieffancypants.loadingBar']);
+
+
+/**
+ * loadingBarInterceptor service
+ *
+ * Registers itself as an Angular interceptor and listens for XHR requests.
+ */
+angular.module('chieffancypants.loadingBar', [])
+  .config(['$httpProvider', function ($httpProvider) {
+
+    var interceptor = ['$q', '$cacheFactory', 'cfpLoadingBar', function ($q, $cacheFactory, cfpLoadingBar) {
+
+      /**
+       * The total number of requests made
+       */
+      var reqsTotal = 0;
+
+      /**
+       * The number of requests completed (either successfully or not)
+       */
+      var reqsCompleted = 0;
+
+
+      /**
+       * calls cfpLoadingBar.complete() which removes the
+       * loading bar from the DOM.
+       */
+      function setComplete() {
+        cfpLoadingBar.complete();
+        reqsCompleted = 0;
+        reqsTotal = 0;
+      }
+
+      /**
+       * Determine if the response has already been cached
+       * @param  {Object}  config the config option from the request
+       * @return {Boolean} retrns true if cached, otherwise false
+       */
+      function isCached(config) {
+        var cache;
+        var defaults = $httpProvider.defaults;
+
+        if (config.method !== 'GET' || config.cache === false) {
+          config.cached = false;
+          return false;
+        }
+
+        if (config.cache === true && defaults.cache === undefined) {
+          cache = $cacheFactory.get('$http');
+        } else if (defaults.cache !== undefined) {
+          cache = defaults.cache;
+        } else {
+          cache = config.cache;
+        }
+
+        var cached = cache !== undefined ?
+          cache.get(config.url) !== undefined : false;
+
+        if (config.cached !== undefined && cached !== config.cached) {
+          return config.cached;
+        }
+        config.cached = cached;
+        return cached;
+      }
+
+      return {
+        'request': function(config) {
+          // Check to make sure this request hasn't already been cached and that
+          // the requester didn't explicitly ask us to ignore this request:
+          if (!config.ignoreLoadingBar && !isCached(config)) {
+            if (reqsTotal === 0) {
+              cfpLoadingBar.start();
+            }
+            reqsTotal++;
+          }
+          return config;
+        },
+
+        'response': function(response) {
+          if (!isCached(response.config)) {
+            reqsCompleted++;
+            if (reqsCompleted >= reqsTotal) {
+              setComplete();
+            } else {
+              cfpLoadingBar.set(reqsCompleted / reqsTotal);
+            }
+          }
+          return response;
+        },
+
+        'responseError': function(rejection) {
+          if (!isCached(rejection.config)) {
+            reqsCompleted++;
+            if (reqsCompleted >= reqsTotal) {
+              setComplete();
+            } else {
+              cfpLoadingBar.set(reqsCompleted / reqsTotal);
+            }
+          }
+          return $q.reject(rejection);
+        }
+      };
+    }];
+
+    $httpProvider.interceptors.push(interceptor);
+  }])
+
+
+  /**
+   * Loading Bar
+   *
+   * This service handles adding and removing the actual element in the DOM.
+   * Generally, best practices for DOM manipulation is to take place in a
+   * directive, but because the element itself is injected in the DOM only upon
+   * XHR requests, and it's likely needed on every view, the best option is to
+   * use a service.
+   */
+  .provider('cfpLoadingBar', function() {
+
+    this.includeSpinner = true;
+    this.includeBar = true;
+    this.parentSelector = 'body';
+
+    this.$get = ['$document', '$timeout', '$animate', '$rootScope', function ($document, $timeout, $animate, $rootScope) {
+
+      var $parentSelector = this.parentSelector,
+        $parent = $document.find($parentSelector),
+        loadingBarContainer = angular.element('<div id="loading-bar"><div class="bar"><div class="peg"></div></div></div>'),
+        loadingBar = loadingBarContainer.find('div').eq(0),
+        spinner = angular.element('<div id="loading-bar-spinner"><div class="spinner-icon"></div></div>');
+
+      var incTimeout,
+        completeTimeout,
+        started = false,
+        status = 0;
+
+      var includeSpinner = this.includeSpinner;
+      var includeBar = this.includeBar;
+
+      /**
+       * Inserts the loading bar element into the dom, and sets it to 2%
+       */
+      function _start() {
+        $timeout.cancel(completeTimeout);
+
+        // do not continually broadcast the started event:
+        if (started) {
+          return;
+        }
+
+        $rootScope.$broadcast('cfpLoadingBar:started');
+        started = true;
+
+        if (includeBar) {
+          $animate.enter(loadingBarContainer, $parent);
+        }
+
+        if (includeSpinner) {
+          $animate.enter(spinner, $parent);
+        }
+        _set(0.02);
+      }
+
+      /**
+       * Set the loading bar's width to a certain percent.
+       *
+       * @param n any value between 0 and 1
+       */
+      function _set(n) {
+        if (!started) {
+          return;
+        }
+        var pct = (n * 100) + '%';
+        loadingBar.css('width', pct);
+        status = n;
+
+        // increment loadingbar to give the illusion that there is always
+        // progress but make sure to cancel the previous timeouts so we don't
+        // have multiple incs running at the same time.
+        $timeout.cancel(incTimeout);
+        incTimeout = $timeout(function() {
+          _inc();
+        }, 250);
+      }
+
+      /**
+       * Increments the loading bar by a random amount
+       * but slows down as it progresses
+       */
+      function _inc() {
+        if (_status() >= 1) {
+          return;
+        }
+
+        var rnd = 0;
+
+        // TODO: do this mathmatically instead of through conditions
+
+        var stat = _status();
+        if (stat >= 0 && stat < 0.25) {
+          // Start out between 3 - 6% increments
+          rnd = (Math.random() * (5 - 3 + 1) + 3) / 100;
+        } else if (stat >= 0.25 && stat < 0.65) {
+          // increment between 0 - 3%
+          rnd = (Math.random() * 3) / 100;
+        } else if (stat >= 0.65 && stat < 0.9) {
+          // increment between 0 - 2%
+          rnd = (Math.random() * 2) / 100;
+        } else if (stat >= 0.9 && stat < 0.99) {
+          // finally, increment it .5 %
+          rnd = 0.005;
+        } else {
+          // after 99%, don't increment:
+          rnd = 0;
+        }
+
+        var pct = _status() + rnd;
+        _set(pct);
+      }
+
+      function _status() {
+        return status;
+      }
+
+      function _complete() {
+        $rootScope.$broadcast('cfpLoadingBar:completed');
+        _set(1);
+
+        // Attempt to aggregate any start/complete calls within 500ms:
+        completeTimeout = $timeout(function() {
+          $animate.leave(loadingBarContainer, function() {
+            status = 0;
+            started = false;
+          });
+          $animate.leave(spinner);
+        }, 500);
+      }
+
+      return {
+        start          : _start,
+        set            : _set,
+        status         : _status,
+        inc            : _inc,
+        complete       : _complete,
+        includeSpinner : this.includeSpinner,
+        parentSelector : this.parentSelector
+      };
+
+
+
+    }];     //
+  });       // wtf javascript. srsly
+})();       //
diff --git a/static/partials/guide.html b/static/partials/guide.html
index e3b8ad4e4..b5a018a75 100644
--- a/static/partials/guide.html
+++ b/static/partials/guide.html
@@ -93,6 +93,15 @@ Email: my@email.com</pre>
       </ul>
     </div>
 
+
+    <h3>Deleting a tag <span class="label label-info">Requires Admin Access</span></h3>
+    <div class="container">
+      <div class="description-overview">
+        A specific tag and all its images can be deleted by right clicking on the tag in the repository history tree and choosing "Delete Tag". This will delete the tag and any images <b>unique to it</b>. Images will not be deleted until all tags sharing them are deleted.
+      </div>
+    </div>
+
+
     <a name="#post-hook"></a>
     <h3>Using push webhooks <span class="label label-info">Requires Admin Access</span></h3>
     <div class="container">
@@ -101,16 +110,16 @@ Email: my@email.com</pre>
       as an HTTP <b>POST</b> to the specified URL, with a JSON body describing the push:<br><br>
       <pre>
 {
-  <span class="code-info" title="The number of images pushed" bs-tooltip="tooltip.title">"pushed_image_count"</span>: 2,
-  <span class="code-info" title="The name of the repository (without its namespace)" bs-tooltip="tooltip.title">"name"</span>: "ubuntu",
-  <span class="code-info" title="The full name of the repository" bs-tooltip="tooltip.title">"repository"</span>:"devtable/ubuntu",
-  <span class="code-info" title="The URL at which the repository can be pulled by Docker" bs-tooltip="tooltip.title">"docker_url"</span>: "quay.io/devtable/ubuntu",
-  <span class="code-info" title="Map of updated tag names to their latest image IDs" bs-tooltip="tooltip.title">"updated_tags"</span>: {
+  <span class="context-tooltip" title="The number of images pushed" bs-tooltip="tooltip.title">"pushed_image_count"</span>: 2,
+  <span class="context-tooltip" title="The name of the repository (without its namespace)" bs-tooltip="tooltip.title">"name"</span>: "ubuntu",
+  <span class="context-tooltip" title="The full name of the repository" bs-tooltip="tooltip.title">"repository"</span>:"devtable/ubuntu",
+  <span class="context-tooltip" title="The URL at which the repository can be pulled by Docker" bs-tooltip="tooltip.title">"docker_url"</span>: "quay.io/devtable/ubuntu",
+  <span class="context-tooltip" title="Map of updated tag names to their latest image IDs" bs-tooltip="tooltip.title">"updated_tags"</span>: {
     "latest": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc"
   },
-  <span class="code-info" title="The namespace of the repository" bs-tooltip="tooltip.title">"namespace"</span>: "devtable",
-  <span class="code-info" title="Whether the repository is public or private" bs-tooltip="tooltip.title">"visibility"</span>: "private",
-  <span class="code-info" title="The Quay URL for the repository" bs-tooltip="tooltip.title">"homepage"</span>: "https://quay.io/repository/devtable/ubuntu"
+  <span class="context-tooltip" title="The namespace of the repository" bs-tooltip="tooltip.title">"namespace"</span>: "devtable",
+  <span class="context-tooltip" title="Whether the repository is public or private" bs-tooltip="tooltip.title">"visibility"</span>: "private",
+  <span class="context-tooltip" title="The Quay URL for the repository" bs-tooltip="tooltip.title">"homepage"</span>: "https://quay.io/repository/devtable/ubuntu"
 }
 </pre>
     </div>
diff --git a/static/partials/image-view.html b/static/partials/image-view.html
index 5d2753d8a..45c9c7a74 100644
--- a/static/partials/image-view.html
+++ b/static/partials/image-view.html
@@ -1,97 +1,99 @@
-<div class="container" ng-show="!loading && !image">
-  No image found
-</div>
+<div class="resource-view" resource="image" error-message="'No image found'">
+  <div class="container repo repo-image-view">
+    <div class="header">
+      <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
+      <h3>
+        <i class="fa fa-archive fa-lg" style="color: #aaa; margin-right: 10px;"></i>
+        <span style="color: #aaa;"> {{repo.namespace}}</span>
+        <span style="color: #ccc">/</span>
+        <span style="color: #666;">{{repo.name}}</span>
+        <span style="color: #ccc">/</span>
+        <span>{{image.value.id.substr(0, 12)}}</span>
+      </h3>
+    </div>
 
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
+    <!-- Comment -->
+    <blockquote ng-show="image.value.comment">
+      <span class="markdown-view" content="image.value.comment"></span>
+    </blockquote>
 
-<div class="container repo repo-image-view" ng-show="!loading && image">
-  <div class="header">
-    <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
-    <h3>
-      <i class="fa fa-archive fa-lg" style="color: #aaa; margin-right: 10px;"></i>
-      <span style="color: #aaa;"> {{repo.namespace}}</span>
-      <span style="color: #ccc">/</span>
-      <span style="color: #666;">{{repo.name}}</span>
-      <span style="color: #ccc">/</span>
-      <span>{{image.id.substr(0, 12)}}</span>
-    </h3>
-   </div>
-
-  <!-- Comment -->
-  <blockquote ng-show="image.comment">
-    <span class="markdown-view" content="image.comment"></span>
-  </blockquote>
-
-  <!-- Information -->
-  <dl class="dl-normal">
-    <dt>Full Image ID</dt>
-    <dd>
-      <div>
-        <div class="id-container">
-          <div class="input-group">
-            <input id="full-id" type="text" class="form-control" value="{{ image.id }}" readonly>
-            <span id="copyClipboard" class="input-group-addon" title="Copy to Clipboard" data-clipboard-target="full-id">
-              <i class="fa fa-copy"></i>
-            </span>
+    <!-- Information -->
+    <dl class="dl-normal">
+      <dt>Full Image ID</dt>
+      <dd>
+        <div>
+          <div class="id-container">
+            <div class="input-group">
+              <input id="full-id" type="text" class="form-control" value="{{ image.value.id }}" readonly>
+              <span id="copyClipboard" class="input-group-addon" title="Copy to Clipboard" data-clipboard-target="full-id">
+                <i class="fa fa-copy"></i>
+              </span>
+            </div>
+          </div>
+          
+          <div id="clipboardCopied" style="display: none">
+            Copied to clipboard
           </div>
         </div>
-        
-        <div id="clipboardCopied" style="display: none">
-          Copied to clipboard
-        </div>
-      </div>
-    </dd>
-    <dt>Created</dt>
-    <dd am-time-ago="parseDate(image.created)"></dd>
-  </dl>
+      </dd>
+      <dt>Created</dt>
+      <dd am-time-ago="parseDate(image.value.created)"></dd>
+      <dt>Compressed Image Size</dt>
+      <dd><span class="context-tooltip"
+                title="The amount of data sent between Docker and Quay.io when pushing/pulling"
+                bs-tooltip="tooltip.title" data-container="body">{{ image.value.size | bytes }}</span>
+      </dd>
 
-  <!-- Changes tabs -->
-  <div ng-show="combinedChanges.length > 0">
-    <b>File Changes:</b>
-    <br>
-    <br>
-    <ul class="nav nav-tabs">
-      <li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#filterable">Filterable View</a></li>
-      <li><a href="javascript:void(0)" data-toggle="tab" data-target="#tree" ng-click="initializeTree()">Tree View</a></li>
-    </ul>
-  </div>
+      <dt ng-show="image.value.command && image.value.command.length">Command</dt>
+      <dd ng-show="image.value.command && image.value.command.length">
+        <pre class="formatted-command">{{ getFormattedCommand(image.value) }}</pre>
+      </dd>
+    </dl>
 
-  <!-- Changes tab content -->
-  <div class="tab-content" ng-show="combinedChanges.length > 0">
-    <!-- Filterable view -->
-    <div class="tab-pane active" id="filterable">
-      <div class="changes-container full-changes-container">
-        <div class="change-side-controls">      
-          <div class="result-count">
-            Showing {{(combinedChanges | filter:search | limitTo:50).length}} of {{(combinedChanges | filter:search).length}} results
-          </div>
-          <div class="filter-input">        
-            <input id="change-filter" class="form-control" placeholder="Filter Changes" type="text" ng-model="search.$">
-          </div>
-        </div> 
-        <div style="height: 28px;"></div>
-        <div class="changes-list well well-sm">
-          <div ng-show="(combinedChanges | filter:search | limitTo:1).length == 0">
-            No matching changes
-          </div>
-          <div class="change" ng-repeat="change in combinedChanges | filter:search | limitTo:50">
-            <i ng-class="{'added': 'fa fa-plus-square', 'removed': 'fa fa-minus-square', 'changed': 'fa fa-pencil-square'}[change.kind]"></i>
-            <span title="{{change.file}}">
-              <span style="color: #888;">
-                <span ng-repeat="folder in getFolders(change.file)"><a href="javascript:void(0)" ng-click="setFolderFilter(getFolder(change.file), $index)">{{folder}}</a>/</span></span><span>{{getFilename(change.file)}}</span>
-            </span>
+    <!-- Changes tabs -->
+    <div ng-show="combinedChanges.length > 0">
+      <b>File Changes:</b>
+      <br>
+      <br>
+      <ul class="nav nav-tabs">
+        <li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#filterable">Filterable View</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#tree" ng-click="initializeTree()">Tree View</a></li>
+      </ul>
+    </div>
+
+    <!-- Changes tab content -->
+    <div class="tab-content" ng-show="combinedChanges.length > 0">
+      <!-- Filterable view -->
+      <div class="tab-pane active" id="filterable">
+        <div class="changes-container full-changes-container">
+          <div class="change-side-controls">      
+            <div class="result-count">
+              Showing {{(combinedChanges | filter:search | limitTo:50).length}} of {{(combinedChanges | filter:search).length}} results
+            </div>
+            <div class="filter-input">        
+              <input id="change-filter" class="form-control" placeholder="Filter Changes" type="text" ng-model="search.$">
+            </div>
+          </div> 
+          <div style="height: 28px;"></div>
+          <div class="changes-list well well-sm">
+            <div ng-show="(combinedChanges | filter:search | limitTo:1).length == 0">
+              No matching changes
+            </div>
+            <div class="change" ng-repeat="change in combinedChanges | filter:search | limitTo:50">
+              <i ng-class="{'added': 'fa fa-plus-square', 'removed': 'fa fa-minus-square', 'changed': 'fa fa-pencil-square'}[change.kind]"></i>
+              <span title="{{change.file}}">
+                <span style="color: #888;">
+                  <span ng-repeat="folder in getFolders(change.file)"><a href="javascript:void(0)" ng-click="setFolderFilter(getFolder(change.file), $index)">{{folder}}</a>/</span></span><span>{{getFilename(change.file)}}</span>
+              </span>
+            </div>
           </div>
         </div>
       </div>
-    </div>
 
-    <!-- Tree view -->
-    <div class="tab-pane" id="tree">
-      <div id="changes-tree-container" class="changes-container" onresize="tree && tree.notifyResized()"></div>
-    </div>
+      <!-- Tree view -->
+      <div class="tab-pane" id="tree">
+        <div id="changes-tree-container" class="changes-container" onresize="tree && tree.notifyResized()"></div>
+      </div>
+    </div>  
   </div>
-  
-  
 </div>
diff --git a/static/partials/landing.html b/static/partials/landing.html
index 714ccabe2..10aa345b4 100644
--- a/static/partials/landing.html
+++ b/static/partials/landing.html
@@ -5,29 +5,32 @@
         <div ng-show="user.anonymous">
           <h1>Secure hosting for <b>private</b> Docker<a class="disclaimer-link" href="/disclaimer" target="_self">*</a> repositories</h1>
           <h3>Use the Docker images <b>your team</b> needs with the safety of <b>private</b> repositories</h3>
-          <div class="sellcall"><a href="/plans/">Private repository plans starting at $7/mo</a></div>
+          <div class="sellcall"><a href="/plans/">Private repository plans starting at $12/mo</a></div>
         </div>
 
         <div ng-show="!user.anonymous">
-          <div ng-show="loadingmyrepos">
-            <i class="fa fa-spinner fa-spin fa-3x"></i>
-          </div>
-          <span class="namespace-selector" user="user" namespace="namespace" ng-show="!loadingmyrepos && user.organizations"></span>
-          <div ng-show="!loadingmyrepos && myrepos.length > 0">
-            <h2>Top Repositories</h2>
-            <div class="repo-listing" ng-repeat="repository in myrepos">
-              <span class="repo-circle no-background" repo="repository"></span>
-              <a ng-href="/repository/{{ repository.namespace }}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
-              <div class="markdown-view description" content="repository.description" first-line-only="true"></div>
+          <span class="namespace-selector" user="user" namespace="namespace" ng-show="user.organizations"></span>
+
+          <div class="resource-view" resource="my_repositories">
+            <!-- Repos -->
+            <div ng-show="my_repositories.value.length > 0">
+              <h2>Top Repositories</h2>            
+              <div class="repo-listing" ng-repeat="repository in my_repositories.value">
+                <span class="repo-circle no-background" repo="repository"></span>
+                <a ng-href="/repository/{{ repository.namespace }}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
+                <div class="markdown-view description" content="repository.description" first-line-only="true"></div>
+              </div>
             </div>
-          </div>
-          <div ng-show="!loadingmyrepos && myrepos.length == 0">
-            <div class="sub-message" style="margin-top: 20px">
-              <span ng-show="namespace != user.username">You don't have access to any repositories in this organization yet.</span>
-              <span ng-show="namespace == user.username">You don't have any repositories yet!</span>
-              <div class="options">
-                <a class="btn btn-primary" href="/repository/">Browse all repositories</a>
-                <a class="btn btn-success" href="/new/" ng-show="canCreateRepo(namespace)">Create a new repository</a>
+
+            <!-- No Repos -->
+            <div ng-show="my_repositories.value.length == 0">
+              <div class="sub-message" style="margin-top: 20px">
+                <span ng-show="namespace != user.username">You don't have access to any repositories in this organization yet.</span>
+                <span ng-show="namespace == user.username">You don't have any repositories yet!</span>
+                <div class="options">
+                  <a class="btn btn-primary" href="/repository/">Browse all repositories</a>
+                  <a class="btn btn-success" href="/new/" ng-show="canCreateRepo(namespace)">Create a new repository</a>
+                </div>
               </div>
             </div>
           </div>
@@ -41,8 +44,8 @@
         <div ng-show="!user.anonymous" class="user-welcome">
           <img class="gravatar" src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=128&d=identicon" />
           <div class="sub-message">Welcome <b>{{ user.username }}</b>!</div>
-          <a ng-show="myrepos" class="btn btn-primary" href="/repository/">Browse all repositories</a>
-          <a ng-show="myrepos" class="btn btn-success" href="/new/">Create a new repository</a>
+          <a ng-show="my_repositories.value" class="btn btn-primary" href="/repository/">Browse all repositories</a>
+          <a class="btn btn-success" href="/new/">Create a new repository</a>
         </div>
       </div> <!-- col -->
     </div> <!-- row -->
@@ -82,7 +85,7 @@
   </div>
 
   <div class="tour-section row">
-    <div class="col-md-7"><img src="/static/img/user-home.png" title="User Home - Quay" data-screenshot-url="https://quay.io/" class="img-responsive"></div>
+    <div class="col-md-7"><img src="/static/img/user-home.png" title="User Home - Quay.io" data-screenshot-url="https://quay.io/" class="img-responsive"></div>
     <div class="col-md-5">
       <div class="tour-section-title">Customized for you</div>
       <div class="tour-section-description">
@@ -93,7 +96,7 @@
   </div>
 
   <div class="tour-section row">
-    <div class="col-md-7 col-md-push-5"><img src="/static/img/repo-view.png" title="Repository View - Quay" data-screenshot-url="https://quay.io/repository/devtable/complex" class="img-responsive"></div>
+    <div class="col-md-7 col-md-push-5"><img src="/static/img/repo-view.png" title="Repository View - Quay.io" data-screenshot-url="https://quay.io/repository/devtable/complex" class="img-responsive"></div>
     <div class="col-md-5 col-md-pull-7">
       <div class="tour-section-title">Useful views of respositories</div>
       <div class="tour-section-description">
@@ -103,7 +106,7 @@
   </div>
 
   <div class="tour-section row">
-    <div class="col-md-7"><img src="/static/img/repo-changes.png" title="View Image - Quay" data-screenshot-url="https://quay.io/repository/devtable/image/..." class="img-responsive"></div>
+    <div class="col-md-7"><img src="/static/img/repo-changes.png" title="View Image - Quay.io" data-screenshot-url="https://quay.io/repository/devtable/image/..." class="img-responsive"></div>
     <div class="col-md-5">
       <div class="tour-section-title">Docker diff in the cloud</div>
       <div class="tour-section-description">
@@ -113,7 +116,7 @@
   </div>
   
   <div class="tour-section row">
-    <div class="col-md-7 col-md-push-5"><img src="/static/img/repo-admin.png" title="Repository Admin - Quay" data-screenshot-url="https://quay.io/repository/devtable/complex/admin" class="img-responsive"></div>
+    <div class="col-md-7 col-md-push-5"><img src="/static/img/repo-admin.png" title="Repository Admin - Quay.io" data-screenshot-url="https://quay.io/repository/devtable/complex/admin" class="img-responsive"></div>
     <div class="col-md-5 col-md-pull-7">
       <div class="tour-section-title">Share at your control</div>
       <div class="tour-section-description">
diff --git a/static/partials/new-organization.html b/static/partials/new-organization.html
index de9927639..79d29e3f9 100644
--- a/static/partials/new-organization.html
+++ b/static/partials/new-organization.html
@@ -1,8 +1,8 @@
-<div class="loading" ng-show="loading || creating">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
+<div class="loading" ng-show="creating">
+  <div class="quay-spinner"></div>
 </div>
 
-<div class="container create-org" ng-show="!loading && !creating">
+<div class="container create-org" ng-show="!creating">
   
   <div class="row header-row">
     <div class="col-md-8 col-md-offset-1">
@@ -72,7 +72,8 @@
           </div>
            
           <div class="button-bar">
-            <button class="btn btn-large btn-success" type="submit" ng-disabled="newOrgForm.$invalid || !currentPlan">
+            <button class="btn btn-large btn-success" type="submit" ng-disabled="newOrgForm.$invalid || !currentPlan"
+                    analytics-on analytics-event="create_organization">
               Create Organization
             </button>
           </div>
diff --git a/static/partials/new-repo.html b/static/partials/new-repo.html
index 393d7003c..3f61d9c7e 100644
--- a/static/partials/new-repo.html
+++ b/static/partials/new-repo.html
@@ -1,13 +1,15 @@
 <div class="container" ng-show="user.anonymous">
-  <h3>Please <a href="/signin/">sign in</a></h3>
+  <div class="col-sm-6 col-sm-offset-3">
+    <div class="user-setup" redirect-url="'/new/'"></div>
+  </div>
 </div>
 
 <div class="container" ng-show="!user.anonymous && building">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
+  <div class="quay-spinner"></div>
 </div>
 
 <div class="container" ng-show="!user.anonymous && creating">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
+  <div class="quay-spinner"></div>
 </div>
 
 <div class="container" ng-show="!user.anonymous && uploading">
@@ -72,12 +74,18 @@
         <!-- Payment -->
         <div class="required-plan" ng-show="repo.is_public == '0' && planRequired && isUserNamespace">
           <div class="alert alert-warning">
-          In order to make this repository private, you’ll need to upgrade your plan from <b>{{ subscribedPlan.title  }}</b> to <b>{{ planRequired.title  }}</b>. This will cost $<span>{{ planRequired.price / 100 }}</span>/month.
+          In order to make this repository private, you’ll need to upgrade your plan to
+          <b style="border-bottom: 1px dotted black;" bs-tooltip="'<b>' + planRequired.title + '</b><br>' + planRequired.privateRepos + ' private repositories'">
+            {{ planRequired.title  }}
+          </b>.
+          This will cost $<span>{{ planRequired.price / 100 }}</span>/month.
           </div>
           <a class="btn btn-primary" ng-click="upgradePlan()" ng-show="!planChanging">Upgrade now</a>
-          <i class="fa fa-spinner fa-spin fa-3x" ng-show="planChanging"></i>
+          <div class="quay-spinner" ng-show="planChanging"></div>
         </div>
 
+        <div class="quay-spinner" ng-show="repo.is_public == '0' && checkingPlan"></div>
+
         <div class="required-plan" ng-show="repo.is_public == '0' && planRequired && !isUserNamespace">
           <div class="alert alert-warning">
             This organization has reached its  private repository limit. Please contact your administrator.
@@ -112,7 +120,10 @@
   <div class="row">
     <div class="col-md-1"></div>
     <div class="col-md-8">
-      <button class="btn btn-large btn-success" type="submit" ng-disabled="newRepoForm.$invalid || (repo.is_public == '0' && planRequired)">Create Repository</button>
+      <button class="btn btn-large btn-success" type="submit"
+              ng-disabled="newRepoForm.$invalid || (repo.is_public == '0' && (planRequired || checkingPlan))">
+        Create Repository
+      </button>
     </div>
   </div>
 
diff --git a/static/partials/org-admin.html b/static/partials/org-admin.html
index 17bdf56df..5c506cc6d 100644
--- a/static/partials/org-admin.html
+++ b/static/partials/org-admin.html
@@ -1,12 +1,5 @@
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
-
-<div class="loading" ng-show="!loading && !organization">
-  No matching organization found
-</div>
-
-<div class="org-admin container" ng-show="!loading && organization">
+<div class="resource-view" resource="orgResource" error-message="'No organization found'"></div>
+<div class="org-admin container" ng-show="organization">
   <div class="organization-header" organization="organization" clickable="true"></div>
   
   <div class="row">
@@ -47,66 +40,12 @@
 
         <!-- Billing History tab -->
         <div id="billing" class="tab-pane">
-          <div ng-show="invoiceLoading">
-            <i class="fa fa-spinner fa-spin fa-3x"></i>
-          </div>
-
-          <div ng-show="!invoiceLoading && !invoices">
-            No invoices have been created
-          </div>
-
-          <div ng-show="!invoiceLoading && invoices">
-            <table class="table">
-              <thead>
-                <th>Billing Date/Time</th>
-                <th>Amount Due</th>
-                <th>Status</th>
-                <th></th>
-              </thead>
-              
-              <tbody class="invoice" ng-repeat="invoice in invoices">
-                <tr class="invoice-title">
-                  <td ng-click="toggleInvoice(invoice.id)"><span class="invoice-datetime">{{ invoice.date * 1000 | date:'medium' }}</span></td>
-                  <td ng-click="toggleInvoice(invoice.id)"><span class="invoice-amount">{{ invoice.amount_due / 100 }}</span></td>
-                  <td>
-                    <span class="invoice-status">
-                      <span class="success" ng-show="invoice.paid">Paid - Thank you!</span>
-                      <span class="danger" ng-show="!invoice.paid && invoice.attempted && invoice.closed">Payment failed</span>
-                      <span class="danger" ng-show="!invoice.paid && invoice.attempted && !invoice.closed">Payment failed - Will retry soon</span>
-                      <span class="pending" ng-show="!invoice.paid && !invoice.attempted">Payment pending</span>
-                    </span>
-                  </td>
-                  <td>
-                    <a ng-show="invoice.paid" href="/receipt?id={{ invoice.id }}" download="receipt.pdf" target="_new">
-                      <i class="fa fa-download" title="Download Receipt" bs-tooltip="tooltip.title"></i>
-                    </a>
-                  </td>
-                </tr>
-
-                <tr ng-class="invoiceExpanded[invoice.id] ? 'in' : 'out'" class="invoice-details panel-collapse collapse">
-                  <td colspan="3">
-                    <dl class="dl-normal">
-                      <dt>Billing Period</dt>
-                      <dd>
-                        <span>{{ invoice.period_start * 1000 | date:'mediumDate' }}</span> -
-                        <span>{{ invoice.period_end * 1000 | date:'mediumDate' }}</span>
-                      </dd>
-                      <dt>Plan</dt>
-                      <dd>
-                        <span>{{ invoice.plan ? plan_map[invoice.plan].title : '(N/A)' }}</span>
-                      </dd>
-                    </dl>
-                  </td>
-                </tr>
-              </tbody>
-            </table>
-          </div>
+          <div class="billing-invoices" organization="organization" visible="invoicesShown"></div>
         </div>
 
         <!-- Members tab -->
         <div id="members" class="tab-pane">
-          <i class="fa fa-spinner fa-spin fa-3x" ng-show="membersLoading"></i>
-
+          <div class="quay-spinner" ng-show="membersLoading"></div>
           <div ng-show="!membersLoading">
             <div class="side-controls">      
               <div class="result-count">
diff --git a/static/partials/org-member-logs.html b/static/partials/org-member-logs.html
index 7750de305..7f5d43077 100644
--- a/static/partials/org-member-logs.html
+++ b/static/partials/org-member-logs.html
@@ -1,16 +1,6 @@
-<div class="org-member-logs container" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
-
-<div class="container" ng-show="!loading && !organization">
-  Organization not found
-</div>
-
-<div class="container" ng-show="!loading && !memberInfo">
-  Member not found
-</div>
-
-<div class="org-member-logs container" ng-show="!loading && organization && memberInfo">
-  <div class="organization-header" organization="organization" clickable="true"></div>
-  <div class="logs-view" organization="organization" performer="memberInfo" visible="organization && memberInfo && ready"></div>
+<div class="resource-view" resource="memberResource" error-message="'Member not found'">
+  <div class="org-member-logs container">
+    <div class="organization-header" organization="organization" clickable="true"></div>
+    <div class="logs-view" organization="organization" performer="memberInfo" visible="organization && memberInfo && ready"></div>
+  </div>
 </div>
diff --git a/static/partials/org-view.html b/static/partials/org-view.html
index 2a6deeb52..2a2dabdf2 100644
--- a/static/partials/org-view.html
+++ b/static/partials/org-view.html
@@ -1,51 +1,45 @@
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
+<div class="resource-view" resource="orgResource" error-message="'No matching organization found'">
+  <div class="org-view container">
+    <div class="organization-header" organization="organization">
+      <div class="header-buttons" ng-show="organization.is_admin">
 
-<div class="loading" ng-show="!loading && !organization">
-  No matching organization found
-</div>
+        <span class="popup-input-button" pattern="TEAM_PATTERN" placeholder="'Team Name'"
+              submitted="createTeam(value)">
+          <i class="fa fa-group"></i> Create Team
+        </span>
 
-<div class="org-view container" ng-show="!loading && organization">
-  <div class="organization-header" organization="organization">
-    <div class="header-buttons" ng-show="organization.is_admin">
-
-      <span class="popup-input-button" pattern="TEAM_PATTERN" placeholder="'Team Name'"
-            submitted="createTeam(value)">
-        <i class="fa fa-group"></i> Create Team
-      </span>
-
-      <a class="btn btn-default" href="/organization/{{ organization.name }}/admin"><i class="fa fa-gear"></i> Settings</a>
+        <a class="btn btn-default" href="/organization/{{ organization.name }}/admin"><i class="fa fa-gear"></i> Settings</a>
+      </div>
     </div>
-  </div>
 
-  <div class="row hidden-xs">
-    <div class="col-md-4 col-md-offset-8 col-sm-5 col-sm-offset-7 header-col" ng-show="organization.is_admin">
-      Team Permissions
-      <i class="info-icon fa fa-info-circle" data-placement="bottom" data-original-title="" title=""
-         data-content="Global permissions for the team and its members<br><br><dl><dt>Member</dt><dd>Permissions are assigned on a per repository basis</dd><dt>Creator</dt><dd>A team can create its own repositories</dd><dt>Admin</dt><dd>A team has full control of the organization</dd></dl>"></i>
+    <div class="row hidden-xs">
+      <div class="col-md-4 col-md-offset-8 col-sm-5 col-sm-offset-7 header-col" ng-show="organization.is_admin">
+        Team Permissions
+        <i class="info-icon fa fa-info-circle" data-placement="bottom" data-original-title="" title=""
+           data-content="Global permissions for the team and its members<br><br><dl><dt>Member</dt><dd>Permissions are assigned on a per repository basis</dd><dt>Creator</dt><dd>A team can create its own repositories</dd><dt>Admin</dt><dd>A team has full control of the organization</dd></dl>"></i>
+      </div>
     </div>
-  </div>
 
-  <div class="team-listing" ng-repeat="(name, team) in organization.teams">
-    <div id="team-{{name}}" class="row">
-      <div class="col-sm-7 col-md-8">
-        <div class="team-title">
-          <i class="fa fa-group"></i>
-          <span ng-show="team.can_view">
-            <a href="/organization/{{ organization.name }}/teams/{{ team.name }}">{{ team.name }}</a>
-          </span>
-          <span ng-show="!team.can_view">
-            {{ team.name }}
-          </span>
+    <div class="team-listing" ng-repeat="(name, team) in organization.teams">
+      <div id="team-{{name}}" class="row">
+        <div class="col-sm-7 col-md-8">
+          <div class="team-title">
+            <i class="fa fa-group"></i>
+            <span ng-show="team.can_view">
+              <a href="/organization/{{ organization.name }}/teams/{{ team.name }}">{{ team.name }}</a>
+            </span>
+            <span ng-show="!team.can_view">
+              {{ team.name }}
+            </span>
+          </div>
+
+          <div class="team-description markdown-view" content="team.description" first-line-only="true"></div>
         </div>
 
-        <div class="team-description markdown-view" content="team.description" first-line-only="true"></div>
-      </div>
-
-      <div class="col-sm-5 col-md-4 control-col" ng-show="organization.is_admin">
-        <span class="role-group" current-role="team.role" role-changed="setRole(role, team.name)" roles="teamRoles"></span>
-        <button class="btn btn-sm btn-danger" ng-click="askDeleteTeam(team.name)">Delete</button>
+        <div class="col-sm-5 col-md-4 control-col" ng-show="organization.is_admin">
+          <span class="role-group" current-role="team.role" role-changed="setRole(role, team.name)" roles="teamRoles"></span>
+          <button class="btn btn-sm btn-danger" ng-click="askDeleteTeam(team.name)">Delete</button>
+        </div>
       </div>
     </div>
   </div>
diff --git a/static/partials/organizations.html b/static/partials/organizations.html
index 1d9c2a96d..8997a65fa 100644
--- a/static/partials/organizations.html
+++ b/static/partials/organizations.html
@@ -1,6 +1,6 @@
 <div class="container org-list conntent-container">  
-  <div class="loading" ng-show="loading">
-    <i class="fa fa-spinner fa-spin fa-3x"></i>
+  <div class="loading" ng-show="!user">
+    <div class="quay-spinner"></div>
   </div>
 
   <div class="button-bar-right">
@@ -43,7 +43,7 @@
 
     
     <div class="tour-section row">
-      <div class="col-md-7"><img src="/static/img/org-repo-list.png" title="Repositories - Quay" data-screenshot-url="https://quay.io/repository/" class="img-responsive"></div>
+      <div class="col-md-7"><img src="/static/img/org-repo-list.png" title="Repositories - Quay.io" data-screenshot-url="https://quay.io/repository/" class="img-responsive"></div>
       <div class="col-md-5">
         <div class="tour-section-title">A central collection of repositories</div>
         <div class="tour-section-description">
@@ -57,7 +57,7 @@
     </div>
 
     <div class="tour-section row">
-      <div class="col-md-7 col-md-push-5"><img src="/static/img/org-admin.png" title="buynlarge Admin - Quay" data-screenshot-url="https://quay.io/organization/buynlarge/admin" class="img-responsive"></div>
+      <div class="col-md-7 col-md-push-5"><img src="/static/img/org-admin.png" title="buynlarge Admin - Quay.io" data-screenshot-url="https://quay.io/organization/buynlarge/admin" class="img-responsive"></div>
       <div class="col-md-5 col-md-pull-7">
         <div class="tour-section-title">Organization settings at a glance</div>
         <div class="tour-section-description">
@@ -73,8 +73,29 @@
     </div>
 
     <div class="tour-section row">
-      <div class="col-md-7"><img src="/static/img/org-teams.png" title="buynlarge - Quay" data-screenshot-url="https://quay.io/organization/buynlarge" class="img-responsive"></div>
+      <div class="col-md-7"><img src="/static/img/org-logs.png" title="buynlarge Admin - Quay.io" data-screenshot-url="https://quay.io/organization/buynlarge" class="img-responsive"></div>
       <div class="col-md-5">
+        <div class="tour-section-title">Logging for comprehensive analysis</div>
+        <div class="tour-section-description">
+          Every time a user in your organization performs an action it is logged
+          and categorized in a way that allows for a complete understanding of
+          how your repositories have been accessed and modified. Each log entry
+          includes the action performed, the authorization which allowed the action
+          to occur, and additional relevant data such as the name of the item
+          which was modified or accessed.
+        </div>
+        <div class="tour-section-description">
+          For those times when you need full control when generating reports from
+          your logs, we also allow you to export your logs in JSON format. These
+          can be ingested by custom tooling solutions allowing you to visualize
+          reports in whatever format you require.
+        </div>
+      </div>
+    </div>
+
+    <div class="tour-section row">
+      <div class="col-md-7 col-md-push-5"><img src="/static/img/org-teams.png" title="buynlarge - Quay.io" data-screenshot-url="https://quay.io/organization/buynlarge" class="img-responsive"></div>
+      <div class="col-md-5 col-md-pull-7">
         <div class="tour-section-title">Teams simplify access controls</div>
         <div class="tour-section-description">
           Teams allow your organization to delegate access to your namespace and
@@ -94,8 +115,8 @@
     </div>
 
     <div class="tour-section row">
-      <div class="col-md-7 col-md-push-5"><img src="/static/img/org-repo-admin.png" title="buynlarge/orgrepo - Quay" data-screenshot-url="https://quay.io/repository/buynlarge/orgrepo" class="img-responsive"></div>
-      <div class="col-md-5 col-md-pull-7">
+      <div class="col-md-7"><img src="/static/img/org-repo-admin.png" title="buynlarge/orgrepo - Quay.io" data-screenshot-url="https://quay.io/repository/buynlarge/orgrepo" class="img-responsive"></div>
+      <div class="col-md-5">
         <div class="tour-section-title">Fine-grained control of sharing</div>
         <div class="tour-section-description">
           Repositories that you create within your organization can be assigned
diff --git a/static/partials/plans.html b/static/partials/plans.html
index 0a82c46a8..20c551e82 100644
--- a/static/partials/plans.html
+++ b/static/partials/plans.html
@@ -1,44 +1,107 @@
 <div class="container plans content-container">
-  <div class="callout">
-    Plans &amp; Pricing
-  </div>
-
-  <div class="all-plans">
-    All plans include <span class="feature">unlimited public repositories</span> and <span class="feature">unlimited sharing</span>. All paid plans have a <span class="feature">14-day free trial</span>.
-  </div>
-
   <div class="row plans-list">
-    <div class="col-xs-0 col-lg-1"></div>
-    <div class="col-lg-2 col-xs-4 plan-container" ng-repeat="plan in plans.user">
-      <div class="plan" ng-class="plan.stripeId">
-        <div class="plan-title">{{ plan.title }}</div>
-        <div class="plan-price">${{ plan.price/100 }}</div>
-        <div class="count"><b>{{ plan.privateRepos }}</b> private repositories</div>
-        <div class="description">{{ plan.audience }}</div>
-        <div class="smaller">SSL secured connections</div>
-        <button class="btn btn-primary btn-block" ng-click="buyNow(plan.stripeId)">Sign Up Now</button>
-      </div>
+    <div class="col-sm-2">
+      <div class="features-bar hidden-xs">
+          <div class="visible-lg" style="height: 50px"></div>
+          <div class="visible-md visible-sm" style="height: 70px"></div>
+
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="All plans have unlimited public repositories">
+              <span class="hidden-sm-inline">Public Repositories</span>
+              <span class="visible-sm-inline">Public Repos</span>
+            </span>
+            <i class="fa fa-hdd visible-lg"></i> 
+          </div>
+          <div class="feature">
+             <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="SSL encryption is enabled end-to-end for all operations">
+               SSL Encryption
+            </span>
+            <i class="fa fa-lock visible-lg"></i>
+          </div>
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="Allows users or organizations to grant permissions in multiple repositories to the same non-login-capable account">
+              Robot accounts
+            </span>
+            <i class="fa fa-wrench visible-lg"></i>
+          </div>
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="Repository images can be built directly from Dockerfiles">
+              Dockerfile Build
+            </span>
+            <i class="fa fa-upload visible-lg"></i>
+          </div>
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="Grant subsets of users in an organization their own permissions, either on a global basis or a per-repository basis">
+              Teams
+            </span>
+            <i class="fa fa-group visible-lg"></i>
+          </div>
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="Every action take within an organization is logged in detail, with the ability to visualize logs and download them">
+              Logging
+            </span>
+            <i class="fa fa-bar-chart-o visible-lg"></i>
+          </div>
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="Administrators can view and download the full invoice history for their organization">
+              Invoice History
+            </span>
+            <i class="fa fa-calendar visible-lg"></i>
+          </div>
+          <div class="feature">
+            <span class="context-tooltip" bs-tooltip="tooltip.title" data-container="body" data-placement="right"
+                  title="All plans have a 14-day free trial">
+              <span class="hidden-sm-inline">14-Day Free Trial</span>
+              <span class="visible-sm-inline">14-Day Trial</span>
+            </span>
+            <i class="fa fa-clock-o visible-lg"></i> 
+          </div>
+        </div>
+
     </div>
-  </div>
+    <div class="col-sm-2 plan-container" ng-repeat="plan in plans" ng-show="plan.price > 0 && !plan.deprecated">
+      <div class="plan" ng-class="plan.stripeId + ' ' + (plan.bus_features ? 'business-plan' : '')">
+        <div class="plan-box">
+          <div class="plan-title">{{ plan.title }}</div>
+          <div class="plan-price">${{ plan.price/100 }}</div>
 
-  <div class="callout">
-    Business Plan Pricing
-  </div>
+          <div class="description">{{ plan.audience }}</div>
+        </div>
 
-  <div class="all-plans">
-    All business plans include all of the personal plan features, plus: <span class="business-feature">organizations</span> and <span class="business-feature">teams</span> with <span class="business-feature">delegated access</span> to the organization. All business plans have a <span class="business-feature">14-day free trial</span>.
-  </div>
+        <div class="features hidden-xs">
+          <div class="count"><b>{{ plan.privateRepos }}</b> private repositories</div>
+          <div class="feature present"></div>
+          <div class="feature present"></div>
+          <div class="feature present"></div>
+          <div class="feature present"></div>
+          <div class="feature" ng-class="plan.bus_features ? 'present' : ''"></div>
+          <div class="feature" ng-class="plan.bus_features ? 'present' : ''"></div>
+          <div class="feature" ng-class="plan.bus_features ? 'present' : ''"></div>
+          <div class="feature present"></div>
+        </div>
+
+        <div class="features visible-xs">
+          <div class="count"><b>{{ plan.privateRepos }}</b> private repositories</div>
+          <div class="feature present">Unlimited Public Repositories</div>
+          <div class="feature present">SSL Encryption</div>
+          <div class="feature present">Robot accounts</div>
+          <div class="feature present">Dockerfile Build</div>
+          <div class="feature" ng-class="plan.bus_features ? 'present' : 'notpresent'">Teams</div>
+          <div class="feature" ng-class="plan.bus_features ? 'present' : 'notpresent'">Logging</div>
+          <div class="feature" ng-class="plan.bus_features ? 'present' : 'notpresent'">Invoice History</div>
+          <div class="feature present">14-Day Free Trial</div>
+        </div>
+
+        <button class="btn btn-block" ng-class="plan.bus_features ? 'btn-success' : 'btn-primary'"
+                ng-click="buyNow(plan.stripeId)">Start <span class="hidden-sm-inline">Free</span> Trial</button>
 
-  <div class="row plans-list">
-    <div class="col-xs-0 col-lg-1"></div>
-    <div class="col-lg-2 col-xs-4 plan-container" ng-repeat="plan in plans.business">
-      <div class="plan business-plan" ng-class="plan.stripeId">
-        <div class="plan-title">{{ plan.title }}</div>
-        <div class="plan-price">${{ plan.price/100 }}</div>
-        <div class="count"><b>{{ plan.privateRepos }}</b> private repositories</div>
-        <div class="description">{{ plan.audience }}</div>
-        <div class="smaller">SSL secured connections</div>
-        <button class="btn btn-success btn-block" ng-click="createOrg(plan.stripeId)">Sign Up Now</button>
       </div>
     </div>
   </div>
@@ -82,7 +145,7 @@
         <div class="user-setup" signed-in="signedIn()" redirect-url="'/plans/'"></div>
       </div>
       <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal" ng-click="cancelNotedPlan()">Close</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
       </div>
     </div><!-- /.modal-content -->
   </div><!-- /.modal-dialog -->
diff --git a/static/partials/repo-admin.html b/static/partials/repo-admin.html
index 50adf5744..c6e33b6b6 100644
--- a/static/partials/repo-admin.html
+++ b/static/partials/repo-admin.html
@@ -1,13 +1,5 @@
-
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
-
-<div class="container" ng-show="!loading && (!repo || !permissions)">
-  No repository found
-</div>
-
-<div class="container repo repo-admin" ng-show="!loading && repo && permissions">
+<div class="resource-view" resource="repository" error-message="'No repository found'"></div>
+<div class="container repo repo-admin" ng-show="repo">
   <div class="header row">
     <a href="{{ '/repository/' + repo.namespace + '/' + repo.name }}" class="back"><i class="fa fa-chevron-left"></i></a>
     <h3>
@@ -35,7 +27,7 @@
         <div id="logs" class="tab-pane">
           <div class="logs-view" repository="repo" visible="logsShown"></div>
         </div>
-      
+        
         <!-- Permissions tab -->
         <div id="permissions" class="tab-pane active">
           <!-- User Access Permissions -->
@@ -137,7 +129,7 @@
 
                   <tr>
                     <td class="admin-search">
-                      <input type="text" class="form-control" placeholder="New token description" ng-model="newToken.friendlyName"required>
+                      <input type="text" class="form-control" placeholder="New token description" ng-model="newToken.friendlyName" required>
                     </td>
                     <td class="admin-search">
                       <button type="submit" ng-disabled="createTokenForm.$invalid" class="btn btn-sm btn-default">Create</button>
@@ -156,39 +148,44 @@
               <i class="info-icon fa fa-info-circle" data-placement="left" data-content="URLs which will be invoked with an HTTP POST and JSON payload when a successful push to the repository occurs."></i>
             </div>
 
-            <div class="panel-body" ng-show="webhooksLoading">
-              Loading webhooks: <i class="fa fa-spinner fa-spin fa-2x" style="vertical-align: middle; margin-left: 4px"></i>
-            </div>
+            <div class="panel-body">
+              <div class="resource-view" resource="webhooksResource" error-message="'Could not load webhooks'">
+                <table class="permissions">
+                  <thead>
+                    <tr>
+                      <td style="width: 500px;">Webhook URL</td>
+                      <td></td>
+                    </tr>
+                  </thead>
+                  
+                  <tbody>
+                    <tr ng-repeat="webhook in webhooks">
+                      <td>{{ webhook.parameters.url }}</td>
+                      <td>
+                        <span class="delete-ui" tabindex="0">
+                          <span class="delete-ui-button" ng-click="deleteWebhook(webhook)"><button class="btn btn-danger">Delete</button></span>
+                          <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Webhook"></i>
+                        </span>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>              
+              </div>
 
-            <div class="panel-body" ng-show="!webhooksLoading">
-              <table class="permissions" ng-form="newWebhookForm">
-                <thead>
-                  <tr>
-                    <td style="width: 500px;">Webhook URL</td>
-                    <td></td>
-                  </tr>
-                </thead>
-                
-                <tbody>
-                  <tr ng-repeat="webhook in webhooks">
-                    <td>{{ webhook.parameters.url }}</td>
-                    <td>
-                      <span class="delete-ui" tabindex="0">
-                        <span class="delete-ui-button" ng-click="deleteWebhook(webhook)"><button class="btn btn-danger">Delete</button></span>
-                        <i class="fa fa-times" bs-tooltip="tooltip.title" data-placement="right" title="Delete Webhook"></i>
-                      </span>
-                    </td>
-                  </tr>
-                  <tr>
-                    <td>
-                      <input type="url" class="form-control" placeholder="New webhook url..." ng-model="newWebhook.url" required>
-                    </td>
-                    <td>
-                      <button class="btn btn-primary" type="submit" ng-click="createWebhook()">Create</button>
-                    </td>
-                  </tr>
-                </tbody>
-              </table>
+              <form name="createWebhookForm" ng-submit="createWebhook()">
+                <table class="permissions">
+                  <tbody>
+                    <tr>
+                      <td style="width: 500px;">
+                        <input type="url" class="form-control" placeholder="New webhook url..." ng-model="newWebhook.url" required>
+                      </td>
+                      <td>
+                        <button class="btn btn-primary" type="submit" ng-disabled="createWebhookForm.$invalid">Create</button>
+                      </td>
+                    </tr>
+                  </tbody>
+                </table>
+              </form>
 
               <div class="right-info">
                 Quay will <b>POST</b> to these webhooks whenever a push occurs. See the <a href="/guide">User Guide</a> for more information.
@@ -240,132 +237,136 @@
       </div>
     </div>
   </div>
-
-  <div class="docker-auth-dialog" username="'$token'" token="shownToken.code"
-       shown="!!shownToken" counter="shownTokenCounter">
-    <i class="fa fa-key"></i> {{ shownToken.friendlyName }}
-  </div>
-
-  <!-- Modal message dialog -->
-  <div class="modal fade" id="cannotchangeModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Cannot change</h4>
-        </div>
-        <div class="modal-body">
-          The selected action could not be performed because you do not have that authority.
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-
-  <!-- Modal message dialog -->
-  <div class="modal fade" id="makepublicModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Make Repository Public</h4>
-        </div>
-        <div class="modal-body">
-          <div class="alert alert-warning">
-            Warning: This will allow <b>anyone</b> to pull from this repository
-          </div>
-          Are you sure you want to make this repository public?
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-danger" ng-click="changeAccess('public')">Make Public</button>
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-  
-
-  <!-- Modal message dialog -->
-  <div class="modal fade" id="makeprivateModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Make Repository Private</h4>
-        </div>
-        <div class="modal-body">
-          <div class="alert alert-warning">
-            Warning: Only users on the permissions list will be able to access this repository.
-          </div>
-      	  Are you sure you want to make this repository private?
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-success" ng-click="changeAccess('private')">Make Private</button>
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-  
-
-  <!-- Modal message dialog -->
-  <div class="modal fade" id="channgechangepermModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Cannot change permissions</h4>
-        </div>
-        <div class="modal-body">
-          <span ng-show="!changePermError">You do not have permission to change the permissions on the repository.</span>
-          <span ng-show="changePermError">{{ changePermError }}</span>
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-  
-
-  <!-- Modal message dialog -->
-  <div class="modal fade" id="confirmdeleteModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Delete Repository?</h4>
-        </div>
-        <div class="modal-body">
-          Are you <b>absolutely, positively</b> sure you would like to delete this repository? This <b>cannot be undone</b>.
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-danger" ng-click="deleteRepo()">Delete Repository</button>
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
+</div>
+</div>
 
 
-  <!-- Modal message dialog -->
-  <div class="modal fade" id="confirmaddoutsideModal">
-    <div class="modal-dialog">
-      <div class="modal-content">
-        <div class="modal-header">
-          <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
-          <h4 class="modal-title">Add User?</h4>
-        </div>
-        <div class="modal-body">
-          The selected user is outside of your organization. Are you sure you want to grant the user access to this repository?
-        </div>
-        <div class="modal-footer">
-          <button type="button" class="btn btn-primary" ng-click="grantRole()">Yes, I'm sure</button>
-          <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
+<!-- Auth dialog -->
+<div class="docker-auth-dialog" username="'$token'" token="shownToken.code"
+     shown="!!shownToken" counter="shownTokenCounter">
+  <i class="fa fa-key"></i> {{ shownToken.friendlyName }}
+</div>
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="cannotchangeModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Cannot change</h4>
+      </div>
+      <div class="modal-body">
+        The selected action could not be performed because you do not have that authority.
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="makepublicModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Make Repository Public</h4>
+      </div>
+      <div class="modal-body">
+        <div class="alert alert-warning">
+          Warning: This will allow <b>anyone</b> to pull from this repository
+        </div>
+        Are you sure you want to make this repository public?
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-danger" ng-click="changeAccess('public')">Make Public</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="makeprivateModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Make Repository Private</h4>
+      </div>
+      <div class="modal-body">
+        <div class="alert alert-warning">
+          Warning: Only users on the permissions list will be able to access this repository.
+        </div>
+      	Are you sure you want to make this repository private?
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-success" ng-click="changeAccess('private')">Make Private</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="channgechangepermModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Cannot change permissions</h4>
+      </div>
+      <div class="modal-body">
+        <span ng-show="!changePermError">You do not have permission to change the permissions on the repository.</span>
+        <span ng-show="changePermError">{{ changePermError }}</span>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="confirmdeleteModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Delete Repository?</h4>
+      </div>
+      <div class="modal-body">
+        Are you <b>absolutely, positively</b> sure you would like to delete this repository? This <b>cannot be undone</b>.
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-danger" ng-click="deleteRepo()">Delete Repository</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="confirmaddoutsideModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Add User?</h4>
+      </div>
+      <div class="modal-body">
+        The selected user is outside of your organization. Are you sure you want to grant the user access to this repository?
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" ng-click="grantRole()">Yes, I'm sure</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
 
diff --git a/static/partials/repo-list.html b/static/partials/repo-list.html
index c8175e2ef..9b740f768 100644
--- a/static/partials/repo-list.html
+++ b/static/partials/repo-list.html
@@ -1,8 +1,4 @@
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
-
-<div class="container" ng-show="!loading">
+<div class="container">
   <div class="repo-list" ng-show="!user.anonymous">
     <div ng-class="user.organizations.length ? 'section-header' : ''">
       <div class="button-bar-right">
@@ -26,31 +22,47 @@
 
     <h3 ng-show="namespace == user.username">Your Repositories</h3>
     <h3 ng-show="namespace != user.username">Repositories</h3>
-    
-    <div ng-show="user_repositories.length > 0">
-      <div class="repo-listing" ng-repeat="repository in user_repositories">
-        <span class="repo-circle no-background" repo="repository"></span>
-        <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
-        <div class="description markdown-view" content="repository.description" first-line-only="true"></div>
+
+    <div class="resource-view" resource="user_repositories">
+      <!-- User/Org has repositories -->
+      <div ng-show="user_repositories.value.length > 0">
+        <div class="repo-listing" ng-repeat="repository in user_repositories.value">
+          <span class="repo-circle no-background" repo="repository"></span>
+          <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
+          <div class="description markdown-view" content="repository.description" first-line-only="true"></div>
+        </div>
+      </div>
+
+      <!-- User/Org has no repositories -->
+      <div ng-show="user_repositories.value.length == 0" style="padding:20px;">
+        <div class="alert alert-info">
+          <h4 ng-show="namespace == user.username">You don't have any repositories yet!</h4>
+          <h4 ng-show="namespace != user.username">This organization doesn't have any repositories, or you have not been provided access.</h4>
+          <a href="/guide"><b>Click here</b> to learn how to create a repository</a>
+        </div>
       </div>
     </div>
 
-    <div ng-show="user_repositories.length == 0" style="padding:20px;">
-      <div class="alert alert-info">
-        <h4 ng-show="namespace == user.username">You don't have any repositories yet!</h4>
-        <h4 ng-show="namespace != user.username">This organization doesn't have any repositories, or you have not been provided access.</h4>
-        <a href="/guide"><b>Click here</b> to learn how to create a repository</a>
-      </div>
-
-    </div>
   </div>
 
   <div class="repo-list">
     <h3>Top Public Repositories</h3>
-    <div class="repo-listing" ng-repeat="repository in public_repositories">
-      <span class="repo-circle no-background" repo="repository"></span>
-      <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
-      <div class="description markdown-view" content="repository.description" first-line-only="true"></div>
+    <div class="resource-view" resource="public_repositories">
+      <div class="repo-listing" ng-repeat="repository in public_repositories.value">
+        <span class="repo-circle no-background" repo="repository"></span>
+        <a ng-href="/repository/{{repository.namespace}}/{{ repository.name }}">{{repository.namespace}}/{{repository.name}}</a>
+        <div class="description markdown-view" content="repository.description" first-line-only="true"></div>
+      </div>
+      <div class="page-controls">
+        <button class="btn btn-default" title="Previous Page" bs-tooltip="title" ng-show="page > 1"
+                ng-click="movePublicPage(-1)">
+          <i class="fa fa-chevron-left"></i>
+        </button>
+        <button class="btn btn-default" title="Next Page" bs-tooltip="title" ng-show="page < publicPageCount"
+                ng-click="movePublicPage(1)">
+          <i class="fa fa-chevron-right"></i>
+        </button>
+      </div>
     </div>
   </div>
 </div>
diff --git a/static/partials/team-view.html b/static/partials/team-view.html
index 1c52dfb35..6119a16fd 100644
--- a/static/partials/team-view.html
+++ b/static/partials/team-view.html
@@ -1,47 +1,42 @@
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
+<div class="resource-view" resource="orgResource" error-message="'No matching organization'">
+  <div class="team-view container">
+    <div class="organization-header" organization="organization" team-name="teamname"></div>
+    
+    <div class="resource-view" resource="membersResource" error-message="'No matching team found'">
+      <div class="description markdown-input" content="team.description" can-write="organization.is_admin"
+           content-changed="updateForDescription" field-title="'team description'"></div>       
 
-<div class="loading" ng-show="!loading && !organization">
-  No matching team found
-</div>
-
-<div class="team-view container" ng-show="!loading && organization">
-  <div class="organization-header" organization="organization" team-name="teamname"></div>
-  
-  <div class="description markdown-input" content="team.description" can-write="organization.is_admin"
-       content-changed="updateForDescription" field-title="'team description'"></div>       
-
-  <div class="panel panel-default">
-    <div class="panel-heading">Team Members
-      <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Users that inherit all permissions delegated to this team"></i>
-    </div>
-    <div class="panel-body">
-      <table class="permissions">        
-        <tr ng-repeat="(name, member) in members">
-          <td class="user entity">
-            <span class="entity-reference" name="member.username" isrobot="member.is_robot"></span>
-          </td>
-          <td>
-            <span class="delete-ui" tabindex="0" title="Remove User" ng-show="canEditMembers">
-              <span class="delete-ui-button" ng-click="removeMember(member.username)"><button class="btn btn-danger">Remove</button></span>
-              <i class="fa fa-times"></i>
-            </span>
-          </td>
-        </tr>
-        
-        <tr ng-show="canEditMembers">
-          <td colspan="2">
-            <span class="entity-search" namespace="orgname" include-teams="false" input-title="'Add a user...'"
-                  entity-selected="addNewMember" is-organization="true"></span>
-          </td>
-        </tr>
-      </table>
+      <div class="panel panel-default">
+        <div class="panel-heading">Team Members
+          <i class="info-icon fa fa-info-circle" data-placement="left" data-content="Users that inherit all permissions delegated to this team"></i>
+        </div>
+        <div class="panel-body">
+          <table class="permissions">        
+            <tr ng-repeat="(name, member) in members">
+              <td class="user entity">
+                <span class="entity-reference" name="member.username" isrobot="member.is_robot"></span>
+              </td>
+              <td>
+                <span class="delete-ui" tabindex="0" title="Remove User" ng-show="canEditMembers">
+                  <span class="delete-ui-button" ng-click="removeMember(member.username)"><button class="btn btn-danger">Remove</button></span>
+                  <i class="fa fa-times"></i>
+                </span>
+              </td>
+            </tr>
+            
+            <tr ng-show="canEditMembers">
+              <td colspan="2">
+                <span class="entity-search" namespace="orgname" include-teams="false" input-title="'Add a user...'"
+                      entity-selected="addNewMember" is-organization="true"></span>
+              </td>
+            </tr>
+          </table>
+        </div>
+      </div>
     </div>
   </div>
 </div>
 
-
 <!-- Modal message dialog -->
 <div class="modal fade" id="cannotChangeTeamModal">
   <div class="modal-dialog">
diff --git a/static/partials/user-admin.html b/static/partials/user-admin.html
index bdf222523..324acfa37 100644
--- a/static/partials/user-admin.html
+++ b/static/partials/user-admin.html
@@ -1,12 +1,12 @@
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
+<div class="loading" ng-show="!user">
+  <div class="quay-spinner"></div>
 </div>
 
-<div class="loading" ng-show="!loading && !user">
+<div class="loading" ng-show="user.anonymous">
   No matching user found
 </div>
 
-<div class="user-admin container" ng-show="!loading && user">  
+<div class="user-admin container" ng-show="!user.anonymous">  
   <div class="row">
     <div class="organization-header-element">
       <img src="//www.gravatar.com/avatar/{{ user.gravatar }}?s=24&amp;d=identicon">
@@ -27,16 +27,24 @@
     <div class="col-md-2">
       <ul class="nav nav-pills nav-stacked">
         <li class="active"><a href="javascript:void(0)" data-toggle="tab" data-target="#plan">Plan and Usage</a></li>
-        <li ng-show="hasPaidPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billing">Billing Options</a></li>
+        <li ng-show="hasPaidPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billingoptions">Billing Options</a></li>
+        <li ng-show="hasPaidBusinessPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#billing" ng-click="loadInvoices()">Billing History</a></li>
         <li><a href="javascript:void(0)" data-toggle="tab" data-target="#robots">Robot Accounts</a></li>
-        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#password">Set Password</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#password">Change Password</a></li>
+        <li><a href="javascript:void(0)" data-toggle="tab" data-target="#github">GitHub Login</a></li>
+        <li ng-show="hasPaidBusinessPlan"><a href="javascript:void(0)" data-toggle="tab" data-target="#logs" ng-click="loadLogs()">Usage Logs</a></li>
         <li><a href="javascript:void(0)" data-toggle="tab" data-target="#migrate" id="migrateTab">Convert to Organization</a></li>
       </ul>
     </div>
 
     <!-- Content -->
     <div class="col-md-10">
-      <div class="tab-content">       
+      <div class="tab-content">
+        <!-- Logs tab -->
+        <div id="logs" class="tab-pane">
+          <div class="logs-view" user="user" visible="logsShown"></div>
+        </div>
+
         <!-- Plans tab -->
         <div id="plan" class="tab-pane active">
           <div class="plan-manager" user="user.username" ready-for-plan="readyForPlan()" plan-changed="planChanged(plan)"></div>
@@ -45,18 +53,48 @@
         <!-- Change password tab -->
         <div id="password" class="tab-pane">
           <div class="loading" ng-show="updatingUser">
-            <i class="fa fa-spinner fa-spin fa-3x"></i>
+            <div class="quay-spinner 3x"></div>
           </div>
           <div class="row">
-            <form class="form-change-pw col-md-6" name="changePasswordForm" ng-submit="changePassword()" data-trigger="manual"
-                  data-content="{{ changePasswordError }}" data-placement="right" ng-show="!awaitingConfirmation && !registering">
-              <input type="password" class="form-control" placeholder="Your new password" ng-model="user.password" required>
-              <input type="password" class="form-control" placeholder="Verify your new password" ng-model="user.repeatPassword"
-                     match="user.password" required>
-              <button class="btn btn-danger" ng-disabled="changePasswordForm.$invalid" type="submit"
-                      analytics-on analytics-event="register">Change Password</button>
+            <div class="panel">
+              <div class="panel-title">Change Password</div>
+
               <span class="help-block" ng-show="changePasswordSuccess">Password changed successfully</span>
-            </form>
+
+              <div ng-show="!updatingUser" class="panel-body">
+                <form class="form-change-pw col-md-6" name="changePasswordForm" ng-submit="changePassword()" data-trigger="manual"
+                      data-content="{{ changePasswordError }}" data-placement="right" ng-show="!awaitingConfirmation && !registering">
+                  <input type="password" class="form-control" placeholder="Your new password" ng-model="cuser.password" required>
+                  <input type="password" class="form-control" placeholder="Verify your new password" ng-model="cuser.repeatPassword"
+                         match="cuser.password" required>
+                  <button class="btn btn-danger" ng-disabled="changePasswordForm.$invalid" type="submit"
+                          analytics-on analytics-event="change_pass">Change Password</button>
+                </form>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div id="github" class="tab-pane">
+          <div class="loading" ng-show="!cuser">
+            <div class="quay-spinner 3x"></div>
+          </div>
+          <div class="row" ng-show="cuser">
+            <div class="panel">
+              <div class="panel-title">GitHub Login</div>
+              <div class="panel-body">
+                <div ng-show="githubLogin" class="lead col-md-8">
+                  <span class="fa-stack">
+                    <i class="fa fa-circle fa-stack-2x check-green"></i>
+                    <i class="fa fa-check fa-stack-1x fa-inverse"></i>
+                  </span>
+                  This account is connected with GitHub account: <b>{{githubLogin}}</b>
+                </div>
+                <div ng-show="!githubLogin" class="col-md-8">
+                  <a href="https://github.com/login/oauth/authorize?client_id={{ githubClientId }}&scope=user:email{{ github_state_clause }}&redirect_uri={{ githubRedirectUri }}/attach" class="btn btn-primary"><i class="fa fa-github fa-lg"></i> Connect with GitHub</a>
+                </div>
+              </div>
+            </div>
           </div>
         </div>
         
@@ -66,10 +104,15 @@
         </div>
 
         <!-- Billing options tab -->
-        <div id="billing" class="tab-pane">
+        <div id="billingoptions" class="tab-pane">
           <div class="billing-options" user="user"></div>
         </div>
 
+        <!-- Billing History tab -->
+        <div id="billing" class="tab-pane">
+          <div class="billing-invoices" user="user" visible="invoicesShown"></div>
+        </div>
+
         <!-- Convert to organization tab -->
         <div id="migrate" class="tab-pane">
           <!-- Step 0 -->
@@ -83,11 +126,11 @@
             </div>
 
             <div class="panel-body" ng-show="user.organizations.length == 0">
-              <div class="alert alert-danger">
-                Converting a user account into an organization <b>cannot be undone</b>.<br> Here be many fire-breathing dragons!
+              <div class="alert alert-warning">
+                Note: Converting a user account into an organization <b>cannot be undone</b>
               </div>
               
-              <button class="btn btn-danger" ng-click="showConvertForm()">Start conversion process</button>
+              <button class="btn btn-primary" ng-click="showConvertForm()">Start conversion process</button>
             </div>
           </div>
 
@@ -110,7 +153,7 @@
                        ng-model="org.adminUser" required autofocus>
                 <input id="adminPassword" name="adminPassword" type="password" class="form-control" placeholder="Admin Password"
                        ng-model="org.adminPassword" required>
-                <span class="description">The username and password for an <b>existing account</b> that will become administrator of the organization</span>
+                <span class="description">The username and password for the account that will become administrator of the organization</span>
               </div>
 
               <!-- Plans Table -->
@@ -120,7 +163,8 @@
               </div>
 
               <div class="button-bar">
-                <button class="btn btn-large btn-danger" type="submit" ng-disabled="convertForm.$invalid || !org.plan">
+                <button class="btn btn-large btn-danger" type="submit" ng-disabled="convertForm.$invalid || !org.plan"
+                        analytics-on analytics-event="convert_to_organization">
                   Convert To Organization
                 </button>
               </div>
diff --git a/static/partials/view-repo.html b/static/partials/view-repo.html
index b2782c47d..89091258e 100644
--- a/static/partials/view-repo.html
+++ b/static/partials/view-repo.html
@@ -1,193 +1,276 @@
-<div class="container" ng-show="!loading && !repo">
-  No repository found
+<div id="tagContextMenu" class="dropdown clearfix" tabindex="-1">
+  <ul class="dropdown-menu" role="menu" aria-labelledby="dropdownMenu">
+    <li><a tabindex="-1" href="javascript:void(0)" ng-click="askDeleteTag(currentMenuTag)">Delete Tag</a></li>
+  </ul>
 </div>
 
-<div class="loading" ng-show="loading">
-  <i class="fa fa-spinner fa-spin fa-3x"></i>
-</div>
+<div class="resource-view" resource="repository" error-message="'No Repository Found'">
+  <div class="container repo">
+    <!-- Repo Header -->
+    <div class="header">
+      <h3>
+        <span class="repo-circle" repo="repo"></span>
+        <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
+        <span class="settings-cog" ng-show="repo.can_admin" title="Repository Settings" bs-tooltip="tooltip.title" data-placement="bottom">
+          <a href="{{ '/repository/' + repo.namespace + '/' + repo.name + '/admin' }}">
+            <i class="fa fa-cog fa-lg"></i>
+          </a>
+        </span>
+      </h3>   
+      
+      <!-- Pull command -->
+      <div class="pull-command visible-md visible-lg" style="display: none;">
+        <span class="pull-command-title">Pull repository:</span>
+        <div class="pull-container">
+          <div class="input-group">
+            <input id="pull-text" type="text" class="form-control" value="{{ 'docker pull quay.io/' + repo.namespace + '/' + repo.name }}" readonly>
+            <span id="copyClipboard" class="input-group-addon" title="Copy to Clipboard" data-clipboard-target="pull-text">
+              <i class="fa fa-copy"></i>
+            </span>
+          </div>
+        </div>
 
-<div class="container repo" ng-show="!loading && repo">
-  <!-- Repo Header -->
-  <div class="header">
-    <h3>
-      <span class="repo-circle" repo="repo"></span>
-
-      <span style="color: #aaa;"> {{repo.namespace}}</span> <span style="color: #ccc">/</span> {{repo.name}}
-
-      <span class="settings-cog" ng-show="repo.can_admin" title="Repository Settings" bs-tooltip="tooltip.title" data-placement="bottom">
-        <a href="{{ '/repository/' + repo.namespace + '/' + repo.name + '/admin' }}">
-          <i class="fa fa-cog fa-lg"></i>
-        </a>
-      </span>
-    </h3>   
-    
-    <!-- Pull command -->
-    <div class="pull-command visible-md visible-lg" style="display: none;">
-      <span class="pull-command-title">Pull repository:</span>
-      <div class="pull-container">
-        <div class="input-group">
-          <input id="pull-text" type="text" class="form-control" value="{{ 'docker pull quay.io/' + repo.namespace + '/' + repo.name }}" readonly>
-          <span id="copyClipboard" class="input-group-addon" title="Copy to Clipboard" data-clipboard-target="pull-text">
-            <i class="fa fa-copy"></i>
-          </span>
+        <div id="clipboardCopied" class="hovering" style="display: none">
+          Copied to clipboard
         </div>
       </div>
+    </div>
 
-      <div id="clipboardCopied" class="hovering" style="display: none">
-        Copied to clipboard
+    <!-- Status boxes -->
+    <div class="status-boxes">
+      <div id="buildInfoBox" class="status-box" ng-show="repo.is_building"
+           bs-popover="'static/partials/build-status-item.html'" data-placement="bottom">
+        <span class="title">
+          <span class="quay-spinner"></span>
+          <b>Building Images</b>
+        </span>
+        <span class="count" ng-class="buildsInfo ? 'visible' : ''"><span>{{ buildsInfo ? buildsInfo.length : '-' }}</span></span>
       </div>
     </div>
-  </div>
 
-  <!-- Status boxes -->
-  <div class="status-boxes">
-    <div id="buildInfoBox" class="status-box" ng-show="repo.is_building"
-         bs-popover="'static/partials/build-status-item.html'" data-placement="bottom">
-      <span class="title">
-        <i class="fa fa-spinner fa-spin"></i>
-        <b>Building Images</b>
-      </span>
-      <span class="count" ng-class="buildsInfo ? 'visible' : ''"><span>{{ buildsInfo ? buildsInfo.length : '-' }}</span></span>
-    </div>
-  </div>
+    <!-- Description -->
+    <div class="description markdown-input" content="repo.description" can-write="repo.can_write"
+         content-changed="updateForDescription" field-title="'repository description'"></div>
 
-  <!-- Description -->
-  <div class="description markdown-input" content="repo.description" can-write="repo.can_write"
-       content-changed="updateForDescription" field-title="'repository description'"></div>
+    <!-- Empty message -->
+    <div class="repo-content" ng-show="!currentTag.image && !currentImage && !repo.is_building">
+      <div class="empty-message">
+        This repository is empty
+      </div>
 
-  <!-- Empty message -->
-  <div class="repo-content" ng-show="!currentTag.image && !repo.is_building">
-    <div class="empty-message">
-      This repository is empty
-    </div>
-
-    <div class="empty-description" ng-show="repo.can_write">
-      To push images to this repository:<br><br>
-      <pre>sudo docker tag <i>0u123imageidgoeshere</i> quay.io/{{repo.namespace}}/{{repo.name}}
+      <div class="empty-description" ng-show="repo.can_write">
+        To push images to this repository:<br><br>
+        <pre>sudo docker tag <i>0u123imageidgoeshere</i> quay.io/{{repo.namespace}}/{{repo.name}}
 sudo docker push quay.io/{{repo.namespace}}/{{repo.name}}</pre>
+      </div>
     </div>
-  </div>
 
-  <div class="repo-content" ng-show="!currentTag.image && repo.is_building">
-    <div class="empty-message">Your build is currently processing, if this takes longer than an hour, please contact <a href="mailto:support@quay.io">Quay.io support</a></div>
-  </div>
+    <div class="repo-content" ng-show="!currentTag.image && repo.is_building">
+      <div class="empty-message">
+        Your build is currently processing, if this takes longer than an hour, please contact <a href="mailto:support@quay.io">Quay.io support</a>
+      </div>
+    </div>
 
-  <!-- Content view -->
-  <div class="repo-content" ng-show="currentTag.image">
-    <!-- Image History -->
-    <div id="image-history" style="max-height: 10px;">
-      <div class="row">
-        <!-- Tree View container -->
-        <div  class="col-md-8">
-
-          <div class="panel panel-default">
-            <div class="panel-heading">
-              <!-- Tag dropdown -->
-              <div class="tag-dropdown dropdown" title="Tags" bs-tooltip="tooltip.title" data-placement="top">
-                <i class="fa fa-tag"><span class="tag-count">{{getTagCount(repo)}}</span></i>
-                <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{currentTag.name}} <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li ng-repeat="tag in repo.tags">
-                    <a href="javascript:void(0)" ng-click="setTag(tag.name)">{{tag.name}}</a>
-                  </li>
-                </ul>
+    <!-- Content view -->
+    <div class="repo-content" ng-show="currentTag.image || currentImage">
+      <!-- Image History -->
+      <div id="image-history" style="max-height: 10px;">
+        <div class="row">
+          <!-- Tree View container -->
+          <div  class="col-md-8">
+            <div class="panel panel-default">             
+              <!-- Image history tree -->
+              <div class="resource-view" resource="imageHistory">
+                <div id="image-history-container" onresize="tree.notifyResized()"></div>
+              </div>
+            </div>	
+          </div>
+
+          <!-- Side Panel -->
+          <div class="col-md-4">
+            <div class="panel panel-default">
+              <div class="panel-heading">
+                <!-- Dropdown -->
+                <div class="tag-dropdown dropdown" data-placement="top">
+                  <i class="fa fa-tag" ng-show="currentTag"></i>
+                  <i class="fa fa-archive" ng-show="!currentTag"></i>
+                  <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{currentTag ? currentTag.name : currentImage.id.substr(0, 12)}} <b class="caret"></b></a>
+                  <ul class="dropdown-menu">
+                    <li ng-repeat="tag in repo.tags">
+                      <a href="javascript:void(0)" ng-click="setTag(tag.name, true)">
+                        <i class="fa fa-tag"></i>{{tag.name}}
+                      </a>
+                    </li>
+                    <li class="divider"></li>
+                    <li ng-repeat="image in imageHistory.value">
+                      <a href="javascript:void(0)" ng-click="setImage(image.id, true)">
+                        {{image.id.substr(0, 12)}}
+                      </a>
+                    </li>
+                  </ul>
+                </div>
+                <span class="right-tag-controls">
+                  <i class="fa fa-tag" title="Tags" bs-tooltip="title">
+                    <span class="tag-count">{{getTagCount(repo)}}</span>
+                  </i>
+                  <i class="fa fa-archive" title="Images" bs-tooltip="title">
+                    <span class="tag-count">{{imageHistory.value.length}}</span>
+                  </i>
+                </span>
               </div>
-              <span class="right-title">Tags</span>
               
-            </div>
+              <div class="panel-body">
+                <!-- Current Tag -->
+                <div id="current-tag" ng-show="currentTag">
+                  <dl class="dl-normal">
+                    <dt>Last Modified</dt>
+                    <dd am-time-ago="parseDate(currentTag.image.created)"></dd>
+                    <dt>Total Compressed Size</dt>
+                    <dd><span class="context-tooltip"
+                              title="The amount of data sent between Docker and Quay.io when pushing/pulling"
+                              bs-tooltip="tooltip.title" data-container="body">{{ getTotalSize(currentTag) | bytes }}</span>
+                    </dd>
+                  </dl>
+                  
+                  <div class="tag-image-sizes">
+                    <div class="tag-image-size" ng-repeat="image in getImagesForTagBySize(currentTag) | limitTo: 10">
+                      <span class="size-limiter">
+                        <span class="size-bar" style="{{ 'width:' + (image.size / getTotalSize(currentTag)) * 100 + '%' }}"
+                              bs-tooltip="image.size | bytes"></span>
+                      </span>
+                      <span class="size-title"><a href="javascript:void(0)" ng-click="setImage(image.id, true)">{{ image.id.substr(0, 12) }}</a></span>
+                    </div>
+                  </div>
 
-            <!-- Image history loading -->
-            <div ng-hide="imageHistory" style="padding: 10px; text-align: center;">
-              <i class="fa fa-spinner fa-spin fa-3x"></i>
-            </div>
+                  <div class="control-bar" ng-show="repo.can_admin">
+                    <button class="btn btn-default" ng-click="askDeleteTag(currentTag.name)">
+                      Delete Tag
+                    </button>
+                  </div>
+                </div>
 
-            <!-- Tree View itself -->
-            <div id="image-history-container" onresize="tree.notifyResized()"></div>
-          </div>	
-        </div>
+                <!-- Current Image -->
+                <div id="current-image" ng-show="currentImage && !currentTag">
+                  <div ng-show="currentImage.comment">
+                    <blockquote style="margin-top: 10px;">
+                      <span class="markdown-view" content="currentImage.comment"></span>
+                    </blockquote>
+                  </div>
 
-        <!-- Side Panel -->
-        <div class="col-md-4">
-         <div class="panel panel-default">
-           <div class="panel-heading">
-             <!-- Image dropdown -->
-              <div class="tag-dropdown dropdown" title="Images" bs-tooltip="tooltip.title" data-placement="top">
-                <i class="fa fa-archive"><span class="tag-count">{{imageHistory.length}}</span></i>
-                <a href="javascript:void(0)" class="dropdown-toggle" data-toggle="dropdown">{{currentImage.id.substr(0, 12)}} <b class="caret"></b></a>
-                <ul class="dropdown-menu">
-                  <li ng-repeat="image in imageHistory">
-                    <a href="javascript:void(0)" ng-click="setImage(image)">{{image.id.substr(0, 12)}}</a>
-                  </li>
-                </ul>
+                  <dl class="dl-normal">
+                    <dt>Created</dt>
+                    <dd am-time-ago="parseDate(currentImage.created)"></dd>
+                    <dt>Image ID</dt>
+                    <dd><a href="{{'/repository/' + repo.namespace + '/' + repo.name + '/image/' + currentImage.id}}">{{ currentImage.id }}</a></dd>
+                    <dt>Compressed Image Size</dt>
+                    <dd><span class="context-tooltip"
+                              title="The amount of data sent between Docker and Quay.io when pushing/pulling"
+                              bs-tooltip="tooltip.title" data-container="body">{{ currentImage.size | bytes }}</span>
+                    </dd>
+                    <dt ng-show="currentImage.command && currentImage.command.length">Command</dt>
+                    <dd ng-show="currentImage.command && currentImage.command.length" class="codetooltipcontainer">
+                      <pre class="formatted-command trimmed"
+                           bs-tooltip="getTooltipCommand(currentImage)"
+                           data-placement="top">{{ getFormattedCommand(currentImage) }}</pre>
+                    </dd>
+                  </dl>
+
+                  <!-- Image changes loading -->
+                  <div class="resource-view" resource="currentImageChangeResource">
+                    <div class="changes-container small-changes-container"
+                         ng-show="currentImageChanges.changed.length || currentImageChanges.added.length || currentImageChanges.removed.length">
+                      <div class="changes-count-container accordion-toggle" data-toggle="collapse" data-parent="#accordion" data-target="#collapseChanges">
+                        <span class="change-count added" ng-show="currentImageChanges.added.length > 0" title="Files Added"
+                              bs-tooltip="tooltip.title" data-placement="top">
+                          <i class="fa fa-plus-square"></i>
+                          <b>{{currentImageChanges.added.length}}</b>
+                        </span>
+                        <span class="change-count removed" ng-show="currentImageChanges.removed.length > 0" title="Files Removed"
+                              bs-tooltip="tooltip.title" data-placement="top">
+                          <i class="fa fa-minus-square"></i>
+                          <b>{{currentImageChanges.removed.length}}</b>
+                        </span>
+                        <span class="change-count changed" ng-show="currentImageChanges.changed.length > 0" title="Files Changed"
+                              bs-tooltip="tooltip.title" data-placement="top">
+                          <i class="fa fa-pencil-square"></i>
+                          <b>{{currentImageChanges.changed.length}}</b>
+                        </span>
+                      </div>
+
+                      <div id="collapseChanges" class="panel-collapse collapse in">
+                        <div class="well well-sm">		     
+                          <div class="change added" ng-repeat="file in currentImageChanges.added | limitTo:5">
+                            <i class="fa fa-plus-square"></i>
+                            <span title="{{file}}">{{file}}</span>
+                          </div>
+                          <div class="change removed" ng-repeat="file in currentImageChanges.removed | limitTo:5">
+                            <i class="fa fa-minus-square"></i>
+                            <span title="{{file}}">{{file}}</span>
+                          </div>
+                          <div class="change changed" ng-repeat="file in currentImageChanges.changed | limitTo:5">
+                            <i class="fa fa-pencil-square"></i>
+                            <span title="{{file}}">{{file}}</span>
+                          </div>
+                        </div>
+                        <div class="more-changes" ng-show="getMoreCount(currentImageChanges) > 0">
+                          <a href="{{'/repository/' + repo.namespace + '/' + repo.name + '/image/' + currentImage.id}}">
+                            And {{getMoreCount(currentImageChanges)}} more...
+                          </a>
+                        </div>
+                      </div>
+                    </div>           
+                  </div>
+                </div>
               </div>
-              <span class="right-title">Image</span>
             </div>
-           
-            <div class="panel-body">
-              <div id="current-image">
-                <div ng-show="currentImage.comment">
-                  <blockquote style="margin-top: 10px;">
-                    <span class="markdown-view" content="currentImage.comment"></span>
-                  </blockquote>
-                </div>
-
-                <dl class="dl-normal">
-                  <dt>Created</dt>
-                  <dd am-time-ago="parseDate(currentImage.created)"></dd>
-                  <dt>Image ID</dt>
-                  <dd><a href="{{'/repository/' + repo.namespace + '/' + repo.name + '/image/' + currentImage.id}}">{{ currentImage.id }}</a></dd>
-                </dl>
-
-               <!-- Image changes loading -->
-                <div ng-hide="currentImageChanges">
-                  <i class="fa fa-spinner fa-spin fa-3x"></i>
-                </div>
-
-                <div class="changes-container small-changes-container"
-                            ng-show="currentImageChanges.changed.length || currentImageChanges.added.length || currentImageChanges.removed.length">
-                  <div class="changes-count-container accordion-toggle" data-toggle="collapse" data-parent="#accordion" data-target="#collapseChanges">
-                    <span class="change-count added" ng-show="currentImageChanges.added.length > 0" title="Files Added"
-                          bs-tooltip="tooltip.title" data-placement="top">
-                      <i class="fa fa-plus-square"></i>
-                      <b>{{currentImageChanges.added.length}}</b>
-                    </span>
-                    <span class="change-count removed" ng-show="currentImageChanges.removed.length > 0" title="Files Removed"
-                          bs-tooltip="tooltip.title" data-placement="top">
-                      <i class="fa fa-minus-square"></i>
-                      <b>{{currentImageChanges.removed.length}}</b>
-                    </span>
-                    <span class="change-count changed" ng-show="currentImageChanges.changed.length > 0" title="Files Changed"
-                          bs-tooltip="tooltip.title" data-placement="top">
-                      <i class="fa fa-pencil-square"></i>
-                      <b>{{currentImageChanges.changed.length}}</b>
-                    </span>
-                  </div>
-
-                  <div id="collapseChanges" class="panel-collapse collapse in">
-                    <div class="well well-sm">		     
-                      <div class="change added" ng-repeat="file in currentImageChanges.added | limitTo:5">
-                        <i class="fa fa-plus-square"></i>
-                        <span title="{{file}}">{{file}}</span>
-                      </div>
-                      <div class="change removed" ng-repeat="file in currentImageChanges.removed | limitTo:5">
-                        <i class="fa fa-minus-square"></i>
-                        <span title="{{file}}">{{file}}</span>
-                      </div>
-                      <div class="change changed" ng-repeat="file in currentImageChanges.changed | limitTo:5">
-                        <i class="fa fa-pencil-square"></i>
-                        <span title="{{file}}">{{file}}</span>
-                      </div>
-                    </div>
-                    <div class="more-changes" ng-show="getMoreCount(currentImageChanges) > 0">
-                      <a href="{{'/repository/' + repo.namespace + '/' + repo.name + '/image/' + currentImage.id}}">And {{getMoreCount(currentImageChanges)}} more...</a>
-                    </div>
-                  </div>
-                </div>
-             </div>
-           </div>
-         </div>
+          </div>
         </div>
       </div>
     </div>
   </div>
 </div>
+
+<!-- Modal message dialog -->
+<div class="modal fade" id="confirmdeleteTagModal">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+        <h4 class="modal-title">Delete tag
+          <span class="label tag" ng-class="tagToDelete == currentTag.name ? 'label-success' : 'label-default'">
+            {{ tagToDelete  }}
+          </span>?
+        </h4>
+      </div>
+      <div class="modal-body">
+        Are you sure you want to delete tag
+        <span class="label tag" ng-class="tagToDelete == currentTag.name ? 'label-success' : 'label-default'">
+          {{ tagToDelete  }}
+        </span>?
+
+        <div ng-show="tagSpecificImages(tagToDelete).length" style="margin-top: 20px">
+          The following images will also be deleted:
+          <div class="image-listings">
+            <div class="image-listing" ng-repeat="image in tagSpecificImages(tagToDelete) | limitTo:5"
+                 ng-class="getImageListingClasses(image, tagToDelete)">
+              <!--<i class="fa fa-archive"></i>-->
+              <span class="image-listing-circle"></span>
+              <span class="image-listing-line"></span>
+              <span class="context-tooltip image-listing-id" bs-tooltip="getFirstTextLine(image.comment)">
+                {{ image.id.substr(0, 12) }}
+              </span>
+            </div>
+          </div>
+          <div class="more-changes" ng-show="tagSpecificImages(tagToDelete).length > 5">
+            And {{ tagSpecificImages(tagToDelete).length - 5 }} more...
+          </div>
+        </div>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" ng-click="deleteTag(tagToDelete)">Delete Tag</button>
+        <button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
+      </div>
+    </div><!-- /.modal-content -->
+  </div><!-- /.modal-dialog -->
+</div><!-- /.modal -->
+
diff --git a/storage/basestorage.py b/storage/basestorage.py
index 94d1af659..1217e3c2b 100644
--- a/storage/basestorage.py
+++ b/storage/basestorage.py
@@ -34,6 +34,10 @@ class Storage(object):
                                              namespace,
                                              repository)
 
+  def image_path(self, namespace, repository, image_id):
+    return '{0}/{1}/{2}/{3}/'.format(self.images, namespace, repository,
+                                     image_id)
+
   def image_json_path(self, namespace, repository, image_id):
     return '{0}/{1}/{2}/{3}/json'.format(self.images, namespace,
                                          repository, image_id)
diff --git a/templates/base.html b/templates/base.html
index c99b58721..78e57d8e3 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -11,6 +11,8 @@
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
+    <link rel="stylesheet" href="/static/lib/loading-bar.css">
+
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/font-awesome/4.0.0/css/font-awesome.css">
     <link rel="stylesheet" href="//netdna.bootstrapcdn.com/bootstrap/3.0.0/css/bootstrap.no-icons.min.css">
     <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'>
@@ -40,13 +42,16 @@
 
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
     <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
+    <script src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-sanitize.min.js"></script>
 
     <script src="//cdn.jsdelivr.net/underscorejs/1.5.2/underscore-min.js"></script>
-    <script src="//cdn.jsdelivr.net/restangular/1.1.3/restangular.js"></script>
+    <script src="//cdn.jsdelivr.net/restangular/1.2.0/restangular.min.js"></script>
 
+    <script src="static/lib/loading-bar.js"></script>
     <script src="static/lib/angular-strap.min.js"></script>
     <script src="static/lib/angulartics.js"></script>
     <script src="static/lib/angulartics-mixpanel.js"></script>
+    <script src="static/lib/angulartics-google-analytics.js"></script>
 
     <script src="static/lib/angular-moment.min.js"></script>
     <script src="static/lib/angular-cookies.min.js"></script>
@@ -61,6 +66,10 @@
 
     {% endblock %}
 
+    <script type="text/javascript">
+      window.__endpoints = {{ route_data|safe }}.endpoints;
+    </script>
+
     <script src="static/js/app.js"></script>
     <script src="static/js/controllers.js"></script>
     <script src="static/js/graphing.js"></script>
@@ -72,6 +81,19 @@ var isProd = document.location.hostname === 'quay.io';
 typeof d?c=b[d]=[]:d="mixpanel";c.people=c.people||[];c.toString=function(b){var a="mixpanel";"mixpanel"!==d&&(a+="."+d);b||(a+=" (stub)");return a};c.people.toString=function(){return c.toString(1)+".people (stub)"};i="disable track track_pageview track_links track_forms register register_once alias unregister identify name_tag set_config people.set people.set_once people.increment people.append people.track_charge people.clear_charges people.delete_user".split(" ");for(g=0;g<i.length;g++)f(c,i[g]);
 b._i.push([a,e,d])};b.__SV=1.2}})(document,window.mixpanel||[]);
 mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8cc7cc29c869f9", { track_pageview : false, debug: !isProd });</script><!-- end Mixpanel -->
+
+<!-- start analytics --><script>
+/*
+var isProd = document.location.hostname === 'quay.io';
+
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+  ga('create', isProd ? 'UA-34988886-5' : 'UA-34988886-4', 'quay.io');
+*/
+</script>
   </head>
   <body>
     <div ng-class="!fixFooter ? 'wrapper' : ''">
@@ -85,27 +107,46 @@ mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8
     </div>
 
     <div class="footer-container" ng-class="fixFooter ? 'fixed' : ''">
-      <nav class="page-footer visible-lg visible-md">
-        <div class="row">         
-          <div class="col-md-8">
-            <ul>
-              <li><span class="copyright">&copy;2013 DevTable, LLC</span></li>
-              <li><a href="http://blog.devtable.com/">Blog</a></li>
-              <li><a href="/tos" target="_self">Terms of Service</a></li>
-              <li><a href="/privacy" target="_self">Privacy Policy</a></li>
-              <li><a href="/security/">Security</a></li>
-              <li><b><a href="/contact/">Contact Us</a></b></li>
-            </ul>
-          </div>
+      <div class="page-footer-padder">
+        <nav class="page-footer visible-lg visible-md">
+          <div class="row">         
+            <div class="col-md-8">
+              <ul>
+                <li><span class="copyright">&copy;2013 DevTable, LLC</span></li>
+                <li><a href="http://blog.devtable.com/">Blog</a></li>
+                <li><a href="/tos" target="_self">Terms of Service</a></li>
+                <li><a href="/privacy" target="_self">Privacy Policy</a></li>
+                <li><a href="/security/">Security</a></li>
+                <li><b><a href="/contact/">Contact Us</a></b></li>
+              </ul>
+            </div>
 
-          <div class="col-md-4 logo-container">
-            <a href="https://devtable.com"><img class="dt-logo" src="/static/img/dt-logo.png"></a>
-          </div>
-        </div> <!-- row -->      
-      </nav>
+            <div class="col-md-5 logo-container">
+              <a href="https://devtable.com"><img class="dt-logo" src="/static/img/dt-logo.png"></a>
+            </div>
+          </div> <!-- row -->      
+        </nav>
+      </div>
     </div>
 
+    <!-- Modal message dialog -->
+    <div class="modal fade" id="couldnotloadModal" data-backdrop="static">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <h4 class="modal-title">Uh Oh...</h4>
+          </div>
+          <div class="modal-body">
+            Something went wrong when trying to load Quay.io! Please report this to <a href="mailto:support@quay.io">support@quay.io</a>.
+          </div>
+          <div class="modal-footer">
+          </div>
+        </div><!-- /.modal-content -->
+      </div><!-- /.modal-dialog -->
+    </div><!-- /.modal -->
+
     <!-- begin olark code -->
+    {% if request.host == 'quay.io' %}
     <script data-cfasync="false" type='text/javascript'>/*<![CDATA[*/window.olark||(function(c){var f=window,d=document,l=f.location.protocol=="https:"?"https:":"http:",z=c.name,r="load";var nt=function(){
     f[z]=function(){
     (a.s=a.s||[]).push(arguments)};var a=f[z]._={
@@ -124,6 +165,7 @@ mixpanel.init(isProd ? "50ff2b2569faa3a51c8f5724922ffb7e" : "38014a0f27e7bdc3ff8
     loader: "static.olark.com/jsclient/loader0.js",name:"olark",methods:["configure","extend","declare","identify"]});
     /* custom configuration goes here (www.olark.com/documentation) */
     olark.identify('1189-336-10-9918');/*]]>*/</script><noscript><a href="https://www.olark.com/site/1189-336-10-9918/contact" title="Contact us" target="_blank">Questions? Feedback?</a> powered by <a href="http://www.olark.com?welcome" title="Olark live chat software">Olark live chat software</a></noscript>
+    {% endif %}
     <!-- end olark code -->
 
   </body>
diff --git a/templates/githuberror.html b/templates/githuberror.html
index c14b84835..acb803f57 100644
--- a/templates/githuberror.html
+++ b/templates/githuberror.html
@@ -16,6 +16,8 @@
 
         <div>
           Please register using the <a href="/">registration form</a> to continue.
+          You will be able to connect your github account to your Quay.io account
+          in the user settings.
         </div>
       </div>
     </div>
diff --git a/test/data/test.db b/test/data/test.db
index c2ef5d652..bc58279da 100644
Binary files a/test/data/test.db and b/test/data/test.db differ
diff --git a/test/specs.py b/test/specs.py
index edaf42946..10e3eee13 100644
--- a/test/specs.py
+++ b/test/specs.py
@@ -105,20 +105,20 @@ def build_specs():
   return [
     TestSpec(url_for('welcome'), 200, 200, 200, 200),
 
-    TestSpec(url_for('plans_list'), 200, 200, 200, 200),
+    TestSpec(url_for('list_plans'), 200, 200, 200, 200),
 
     TestSpec(url_for('get_logged_in_user'), 200, 200, 200, 200),
 
     TestSpec(url_for('change_user_details'),
              401, 200, 200, 200).set_method('PUT'),
 
-    TestSpec(url_for('create_user_api'), 201, 201, 201,
+    TestSpec(url_for('create_new_user'), 201, 201, 201,
              201).set_method('POST').set_data_from_obj(NEW_USER_DETAILS),
 
-    TestSpec(url_for('signin_api'), 200, 200, 200,
+    TestSpec(url_for('signin_user'), 200, 200, 200,
              200).set_method('POST').set_data_from_obj(SIGNIN_DETAILS),
 
-    TestSpec(url_for('send_recovery'), 201, 201, 201,
+    TestSpec(url_for('request_recovery_email'), 201, 201, 201,
              201).set_method('POST').set_data_from_obj(SEND_RECOVERY_DETAILS),
 
     TestSpec(url_for('get_matching_users', prefix='dev'), 401, 200, 200, 200),
@@ -161,29 +161,29 @@ def build_specs():
                      teamname=ORG_READERS, membername=ORG_OWNER),
              admin_code=400).set_method('DELETE'),
 
-    (TestSpec(url_for('create_repo_api'))
+    (TestSpec(url_for('create_repo'))
       .set_method('POST')
       .set_data_from_obj(NEW_ORG_REPO_DETAILS)),
 
-    TestSpec(url_for('match_repos_api'), 200, 200, 200, 200),
+    TestSpec(url_for('find_repos'), 200, 200, 200, 200),
 
-    TestSpec(url_for('list_repos_api'), 200, 200, 200, 200),
+    TestSpec(url_for('list_repos'), 200, 200, 200, 200),
 
-    TestSpec(url_for('update_repo_api', repository=PUBLIC_REPO),
+    TestSpec(url_for('update_repo', repository=PUBLIC_REPO),
              admin_code=403).set_method('PUT'),
-    (TestSpec(url_for('update_repo_api', repository=ORG_REPO))
+    (TestSpec(url_for('update_repo', repository=ORG_REPO))
       .set_method('PUT')
       .set_data_from_obj(UPDATE_REPO_DETAILS)),
-    (TestSpec(url_for('update_repo_api', repository=PRIVATE_REPO))
+    (TestSpec(url_for('update_repo', repository=PRIVATE_REPO))
       .set_method('PUT')
       .set_data_from_obj(UPDATE_REPO_DETAILS)),
 
-    (TestSpec(url_for('change_repo_visibility_api', repository=PUBLIC_REPO),
+    (TestSpec(url_for('change_repo_visibility', repository=PUBLIC_REPO),
               admin_code=403).set_method('POST')
       .set_data_from_obj(CHANGE_VISIBILITY_DETAILS)),
-    (TestSpec(url_for('change_repo_visibility_api', repository=ORG_REPO))
+    (TestSpec(url_for('change_repo_visibility', repository=ORG_REPO))
       .set_method('POST').set_data_from_obj(CHANGE_VISIBILITY_DETAILS)),
-    (TestSpec(url_for('change_repo_visibility_api', repository=PRIVATE_REPO))
+    (TestSpec(url_for('change_repo_visibility', repository=PRIVATE_REPO))
       .set_method('POST').set_data_from_obj(CHANGE_VISIBILITY_DETAILS)),
 
     TestSpec(url_for('delete_repository', repository=PUBLIC_REPO),
@@ -193,11 +193,11 @@ def build_specs():
     TestSpec(url_for('delete_repository', repository=PRIVATE_REPO),
              admin_code=204).set_method('DELETE'),
 
-    TestSpec(url_for('get_repo_api', repository=PUBLIC_REPO),
+    TestSpec(url_for('get_repo', repository=PUBLIC_REPO),
              200, 200, 200,200),
-    TestSpec(url_for('get_repo_api', repository=ORG_REPO),
+    TestSpec(url_for('get_repo', repository=ORG_REPO),
              403, 403, 200, 200),
-    TestSpec(url_for('get_repo_api', repository=PRIVATE_REPO),
+    TestSpec(url_for('get_repo', repository=PRIVATE_REPO),
              403, 403, 200, 200),
 
     TestSpec(url_for('get_repo_builds', repository=PUBLIC_REPO),
@@ -403,20 +403,20 @@ def build_specs():
     TestSpec(url_for('delete_token', repository=PRIVATE_REPO,
                      code=FAKE_TOKEN), admin_code=400).set_method('DELETE'),
 
-    TestSpec(url_for('subscribe_api'), 401, 400, 400, 400).set_method('PUT'),
+    TestSpec(url_for('update_user_subscription'), 401, 400, 400, 400).set_method('PUT'),
 
-    TestSpec(url_for('subscribe_org_api', orgname=ORG),
+    TestSpec(url_for('update_org_subscription', orgname=ORG),
              401, 403, 403, 400).set_method('PUT'),
 
-    TestSpec(url_for('get_subscription'), 401, 200, 200, 200),
+    TestSpec(url_for('get_user_subscription'), 401, 200, 200, 200),
 
     TestSpec(url_for('get_org_subscription', orgname=ORG)),
 
-    TestSpec(url_for('repo_logs_api', repository=PUBLIC_REPO), admin_code=403),
-    TestSpec(url_for('repo_logs_api', repository=ORG_REPO)),
-    TestSpec(url_for('repo_logs_api', repository=PRIVATE_REPO)),
+    TestSpec(url_for('list_repo_logs', repository=PUBLIC_REPO), admin_code=403),
+    TestSpec(url_for('list_repo_logs', repository=ORG_REPO)),
+    TestSpec(url_for('list_repo_logs', repository=PRIVATE_REPO)),
     
-    TestSpec(url_for('org_logs_api', orgname=ORG)),
+    TestSpec(url_for('list_org_logs', orgname=ORG)),
   ]
 
 
diff --git a/tools/backfill_commands.py b/tools/backfill_commands.py
new file mode 100644
index 000000000..d781cdfeb
--- /dev/null
+++ b/tools/backfill_commands.py
@@ -0,0 +1,20 @@
+from data.database import Image
+from app import app
+import json
+
+
+store = app.config['STORAGE']
+
+
+for image in Image.select():
+  if image.command == None:
+    image_json_path = store.image_json_path(image.repository.namespace,
+                                            image.repository.name,
+                                            image.docker_image_id)
+    if store.exists(image_json_path):
+      data = json.loads(store.get_content(image_json_path))
+      command_list = data.get('container_config', {}).get('Cmd', None)
+      command = json.dumps(command_list) if command_list else None
+      print 'Setting command to: %s' % command
+      image.command = command
+      image.save()
\ No newline at end of file
diff --git a/tools/backfillsizes.py b/tools/backfillsizes.py
new file mode 100644
index 000000000..2f60cd374
--- /dev/null
+++ b/tools/backfillsizes.py
@@ -0,0 +1,17 @@
+from data.database import Image
+from app import app
+
+
+store = app.config['STORAGE']
+
+
+for image in Image.select():
+  if image.image_size == None:
+    image_path = store.image_layer_path(image.repository.namespace,
+                                        image.repository.name,
+                                        image.docker_image_id)
+    if store.exists(image_path):
+      size = store.get_size(image_path)
+      print 'Setting image %s size to: %s' % (image.docker_image_id, size)
+      image.image_size = size
+      image.save()
\ No newline at end of file
diff --git a/tools/monthlyrevenue.py b/tools/monthlyrevenue.py
index 9472eeda6..52fc8bff6 100644
--- a/tools/monthlyrevenue.py
+++ b/tools/monthlyrevenue.py
@@ -1,19 +1,36 @@
 from app import stripe
+from collections import defaultdict
 
 EXCLUDE_CID = {'cus_2iVlmwz8CpHgOj'}
 
 offset = 0
 total_monthly_revenue = 0
 
+def empty_tuple():
+  return (0, 0)
+
+plan_revenue = defaultdict(empty_tuple)
+
 batch = stripe.Customer.all(count=100, offset=offset)
 while batch.data:
   for cust in batch.data:
     if cust.id not in EXCLUDE_CID and cust.subscription:
       sub = cust.subscription
       total_monthly_revenue += sub.plan.amount * sub.quantity
+      subscribers, revenue = plan_revenue[sub.plan.id]
+      plan_revenue[sub.plan.id] = (subscribers + 1,
+                                   revenue + sub.plan.amount * sub.quantity)
   offset += len(batch.data)
   batch = stripe.Customer.all(count=100, offset=offset)
 
-dollars = total_monthly_revenue / 100
-cents = total_monthly_revenue % 100
-print 'Monthly revenue: $%d.%02d' % (dollars, cents)
+def format_money(total_cents):
+  dollars = total_cents / 100
+  cents = total_cents % 100
+  return dollars, cents
+
+for plan_id, (subs, rev) in plan_revenue.items():
+  d, c = format_money(rev)
+  print '%s: $%d.%02d(%s)' % (plan_id, d, c, subs)
+
+d, c = format_money(total_monthly_revenue)
+print 'Monthly revenue: $%d.%02d' % (d, c)
diff --git a/util/cache.py b/util/cache.py
index 96160a71e..5ba0a7a34 100644
--- a/util/cache.py
+++ b/util/cache.py
@@ -10,3 +10,12 @@ def cache_control(max_age=55):
       return response
     return add_max_age
   return wrap
+
+
+def no_cache(f):
+  @wraps(f)
+  def add_no_cache(*args, **kwargs):
+    response = f(*args, **kwargs)
+    response.headers['Cache-Control'] = 'no-cache'
+    return response
+  return add_no_cache
diff --git a/workers/dockerfilebuild.py b/workers/dockerfilebuild.py
index a03342ea0..acea05c20 100644
--- a/workers/dockerfilebuild.py
+++ b/workers/dockerfilebuild.py
@@ -26,7 +26,8 @@ formatter = logging.Formatter(FORMAT)
 
 logger = logging.getLogger(__name__)
 
-BUILD_SERVER_CMD = ('docker run -d -lxc-conf="lxc.aa_profile=unconfined" ' +
+BUILD_SERVER_CMD = ('docker run -d -p 5002:5002 ' + 
+                    '-lxc-conf="lxc.aa_profile=unconfined" ' +
                     '-privileged -e \'RESOURCE_URL=%s\' -e \'TAG=%s\' ' +
                     '-e \'TOKEN=%s\' quay.io/quay/buildserver')
 
@@ -85,7 +86,7 @@ def babysit_builder(request):
                                    api_key=do_api_key,
                                    name=name,
                                    region_id=regions.pop(),
-                                   image_id=1004145,  # Docker on 13.04
+                                   image_id=app.config['DO_DOCKER_IMAGE'],
                                    size_id=66,  # 512MB,
                                    backup_active=False)
     retry_command(droplet.create, [],
@@ -189,7 +190,7 @@ def babysit_builder(request):
     retry_command(droplet.destroy)
 
     repository_build.status_url = None
-    repository_build.build_node_id = None;
+    repository_build.build_node_id = None
     repository_build.save()
 
     return True