--- a/dbsetup.py
+++ b/dbsetup.py
@@ -20,7 +20,7 @@
 
 # Import all modules which represents a SQLAlchemy model;
 # they have corresponding tables that are needed to be created
-from swtstore.classes.models import Sweet, Context, Client
+from swtstore.classes.models import Sweet, Context, Client, AuthorizedClients
 from swtstore.classes.models.um import User, Group, Membership
 
 # Create them!
--- a/runserver.py
+++ b/runserver.py
@@ -19,5 +19,5 @@
 # Run the server if this script is directly executed
 # Presumably, this is development mode
 if __name__ == '__main__':
-    app.run(host='0.0.0.0', port=5001)
+    app.run(debug=True, host='0.0.0.0', port=5001)
--- a/swtstore/classes/models/__init__.py
+++ b/swtstore/classes/models/__init__.py
@@ -1,4 +1,4 @@
 from context import Context
 from sweet import Sweet
-from client import Client
+from client import Client, AuthorizedClients
--- a/swtstore/classes/models/client.py
+++ b/swtstore/classes/models/client.py
@@ -219,4 +219,47 @@
 @oauth.usergetter
 def getUser():
     return User.getCurrentUser()
+
+
+
+# Authorized Clients
+class AuthorizedClients(db.Model):
+    """
+     The clients authorized by users
+    """
+
+    __tablename__ = 'authorized_clients'
+
+    id = db.Column(db.Integer, primary_key=True)
+
+    client_id = db.Column(db.String(40), db.ForeignKey('clients.id'),
+                          nullable=False)
+    client = db.relationship('Client')
+
+    user_id = db.Column(db.Integer, db.ForeignKey('users.id'))
+    user = db.relationship('User')
+
+    def persist(self):
+        db.session.add(self)
+        db.session.commit()
+
+    @staticmethod
+    def revoke(**kwargs):
+        user = kwargs.get('user')
+        client = kwargs.get('client')
+        authorization = AuthorizedClients.query.filter_by(user_id=user.id,
+                                          client_id=client.client_id).first()
+        current_app.logger.debug('authorization to be revoked-- %s',
+                                 authorization)
+        db.session.delete(authorization)
+        db.session.commit()
+
+    @staticmethod
+    def getByUser(user):
+        authorized_clients = [row.client for row in \
+                AuthorizedClients.query.filter_by(user_id=user.id).all()]
+
+        current_app.logger.debug('authorized clients %s', authorized_clients)
+
+        return authorized_clients
--- a/swtstore/classes/views/app.py
+++ b/swtstore/classes/views/app.py
@@ -22,7 +22,7 @@
         return redirect(url_for('frontend.index'))
 
     if request.method == 'GET':
-        return render_template('register_app.html')
+        return render_template('app/register.html')
 
     elif request.method == 'POST':
         req_fields = ['name', 'host_url', 'redirect_uris', 'scopes']
--- a/swtstore/classes/views/context.py
+++ b/swtstore/classes/views/context.py
@@ -17,7 +17,7 @@
         return redirect(url_for('frontend.index'))
 
     if request.method == 'GET':
-        return render_template('register_context.html')
+        return render_template('context/register.html')
 
     if request.method == 'POST':
       if not request.form.get('name') or not request.form.get('defn'):
--- a/swtstore/classes/views/frontend.py
+++ b/swtstore/classes/views/frontend.py
@@ -19,7 +19,7 @@
 
     user = User.getCurrentUser()
 
-    return render_template('index.html', sweets=sweets)
+    return render_template('frontend/index.html', sweets=sweets)
 
 
 # Create a new sweet context
--- a/swtstore/classes/views/oauth.py
+++ b/swtstore/classes/views/oauth.py
@@ -3,20 +3,22 @@
 
 from flask import Module, jsonify, request, render_template, redirect,\
                     url_for, current_app
+import requests
 
 from swtstore.classes import oauth
 from swtstore.classes.models.um import User
-from swtstore.classes.models import Client
+from swtstore.classes.models import Client, AuthorizedClients
 
 
 Oauth = Module(__name__)
 
+
 @Oauth.route('/authorize', methods=['GET', 'POST'])
 @oauth.authorize_handler
 def authorize(*args, **kwargs):
     current_user = User.getCurrentUser()
     if current_user is None:
-        return render_template('oauth_login.html')
+        return render_template('oauth/login.html')
 
     if request.method == 'GET':
         client_id = kwargs.get('client_id')



@@ -25,11 +27,31 @@
         kwargs['client'] = client
         kwargs['user'] = current_user
         current_app.logger.debug('kwargs %s', kwargs)
-        return render_template('authorize.html', **kwargs)
 
+        # See if this client is already authorized by user. If not then return
+        # a HTML to allow access.
+        authorized_clients = AuthorizedClients.getByUser(current_user)
+        if client in authorized_clients:
+            return render_template('oauth/authorized.html', **kwargs)
+        else:
+            return render_template('oauth/authorize.html', **kwargs)
+
+
     confirm = request.form.get('confirm', 'no')
+    authorized = request.form.get('authorized', 'no')
     current_app.logger.debug('confirm authorize from user: %s', confirm)
-    return confirm == 'yes'
+    client = Client.query.get(request.form.get('client_id'))
+
+    if authorized == 'yes':
+        return True
+    else:
+        if confirm == 'yes':
+            authorization = AuthorizedClients(user=current_user, client=client)
+            authorization.persist()
+            return True
+        else:
+            return False
+
 
 @Oauth.route('/token', methods=['GET', 'POST'])
 @oauth.token_handler
--- a/swtstore/classes/views/sweet.py
+++ b/swtstore/classes/views/sweet.py
@@ -23,7 +23,7 @@
     sweet = Sweet.query.get(id)
     if sweet:
         print "sweet found " + str(sweet)
-        return render_template('specific_sweet.html', sweet=sweet)
+        return render_template('sweet/specific.html', sweet=sweet)
     else:
         abort(404)
--- a/swtstore/classes/views/user.py
+++ b/swtstore/classes/views/user.py
@@ -9,7 +9,7 @@
 
 # swtstore imports
 from swtstore.classes.models.um import User
-from swtstore.classes.models import Sweet, Context, Client
+from swtstore.classes.models import Sweet, Context, Client, AuthorizedClients
 
 from swtstore.classes.utils.httputils import makeCORSHeaders
 from swtstore.config import DefaultConfig

@@ -89,8 +89,9 @@
         return redirect(url_for('frontend.index'))
 
     if request.method == 'GET':
-        return render_template('me.html', user=current_user)
+        return render_template('user/me.html', user=current_user)
 
+    # else POST request
     username = request.form.get('username')
 
     current_app.logger.debug('Updating username of %s to %s',
@@ -109,7 +110,7 @@
         return redirect(url_for('frontend.index'))
 
     swts = Sweet.getByCreator(user)
-    return render_template('my_sweets.html', sweets=swts)
+    return render_template('user/sweets.html', sweets=swts)
 
 
 @user.route('/me/contexts', methods=['GET'])
@@ -120,7 +121,7 @@
         return redirect(url_for('frontend.index'))
 
     contexts = Context.getByCreator(user.id)
-    return render_template('my_contexts.html', contexts=contexts)
+    return render_template('user/contexts.html', contexts=contexts)
 
 
 @user.route('/me/apps', methods=['GET'])
@@ -132,5 +133,26 @@
         return redirect(url_for('frontend.index'))
 
     apps = Client.getClientsByCreator(user.id)
-    return render_template('my_apps.html', apps=apps)
+    return render_template('user/apps.html', apps=apps)
+
+@user.route('/me/authorized_apps', methods=['GET', 'POST'])
+def authorizedApps():
+
+    user = User.getCurrentUser()
+    if user is None:
+        return redirect(url_for('frontend.index'))
+
+    if request.method == 'GET':
+        authorized_clients = AuthorizedClients.getByUser(user)
+        return render_template('user/authorized_apps.html',
+                                authorized_clients=authorized_clients)
+
+    # else POST request
+    client_id = request.form.get('revoke-id', '')
+    if client_id:
+        client = Client.query.get(client_id)
+        current_app.logger.info('user %s revoking access to %s', user, client)
+        AuthorizedClients.revoke(user=user, client=client)
+
+    return redirect(url_for('authorizedApps'))
--- /dev/null
+++ b/swtstore/templates/app/list_apps.html
@@ -1 +1,26 @@
+{% extends "layout.html" %}
+{% block body %}
+<div>
+  {% if apps|length > 0 %}
+    <ul>
+    {% for app in apps %}
+      <div class="well">
+        <div class="pull-right">
+          <span class="glyphicon glyphicon-trash"></span>
+        </div>
+        <div><h4> {{ app.name }} </h4></div>
+        <div><h5> {{ app.description }} </h5></div>
+        <div>APP ID: {{ app.id }} </div>
+        <div> APP Secret: {{ app.client_secret }} </div>
+        <div>Host URL: {{ app.host_url }} </div>
+        <div>Redirect URL: {{ app.redirect_uris|join(', ') }} </div>
+        <div>Scopes: {{ app.default_scopes|join(', ') }} </div>
+      </div>
+    {% endfor %}
+  </ul>
+  {% else %}
+  <em> You haven't registered any apps yet! </em>
+  {% endif %}
+</div>
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/app/register.html
@@ -1 +1,66 @@
+{% extends "layout.html" %}
+{% block body %}
+<h4> Register a new app with the <i>swt web</i> platform </h4>
+<p class="text-muted"> Please fill in the details below and click Register button </p>
+
+<form role="form" method="POST" action="{{ url_for('app.register') }}">
+  <div class="form-group">
+    <label for="name">Name </label>
+    <input type="text" class="form-control" name="name" id="name" placeholder="Name of the application">
+  </div>
+  <div class="form-group">
+    <label for="desc">Description</label>
+    <p class="help-block"> Brief description of your application. (Optional)</p>
+    <textarea class="form-control" rows="4" id="desc" name="desc">
+    </textarea>
+  </div>
+  <div class="form-group">
+    <label for="host_url">Host URL</label>
+    <p class="help-block">URL where your app is deployed</p>
+    <input type="text" class="form-control" name="host_url" id="host_url" placeholder="host URL">
+  </div>
+  <div class="form-group">
+    <label for="redirect_uris">Redirect URLs</label>
+    <p class="help-block">Your app URL where it should be redirected once the user is authorized.</p>
+    <input type="text" class="form-control" name="redirect_uris" id="redirect_uris" placeholder="redirect URLs">
+  </div>
+  <div class="form-group">
+    <label for="scopes">Scopes</label>
+    <input type="text" class="form-control" name="scopes" id="scopes" value="email">
+  </div>
+  <button type="submit" class="btn btn-primary">Register</button>
+</form>
+{% endblock %}
+{% block scripts %}
+<script>
+  // form validation
+  /*$('form').on('submit', function(event) {
+    console.log('here..');
+    if(!$('#name').val()) {
+      event.preventDefault();
+      $('#name').parent().addClass('has-feedback');
+      $('#name').parent().addClass('has-error');
+      return false;
+    }
+    if(!$('#host_url').val()) {
+      event.preventDefault();
+      $('#host_url').parent().addClass('has-feedback');
+      $('#name').parent().addClass('has-error');
+      return false;
+    }
+    if(!$('#redirect_uris').val()) {
+      event.preventDefault();
+      $('#redirect_uris').parent().addClass('has-feedback');
+      $('#name').parent().addClass('has-error');
+      return false;
+    }
+    if(!$('#scopes').val()) {
+      event.preventDefault();
+      $('#scopes').parent().addClass('has-feedback');
+      $('#name').parent().addClass('has-error');
+      return false;
+    }
+  });*/
+</script>
+{% endblock %}
--- a/swtstore/templates/authorize.html
+++ /dev/null
@@ -1,44 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<h4> Allow Access ?</h4>
-<p class="text-muted">
-  The following application wants to get permission to do stuff(?) on the <i>swt
-  web</i> platform on your behalf.
-</p>
-
-<form role="form" method="POST" action="{{ url_for('oauth.authorize') }}">
-  <div class="form-group">
-    <p class="form-control-static text-primary">
-      {{ client.name }} at {{ client.host_url }} wants
-      to get permission to post data to swt store
-    </p>
-  </div>
-  <div class="form-group">
-    <label class="control-label">Scopes</label>
-    <div class="">
-      <p class="form-control-static">{{ scopes|join(',') }}</p>
-    </div>
-  </div>
-  <input type="hidden" name="client_id" value="{{ client.id }}">
-  <input type="hidden" name="scope" value="{{ scopes|join(' ') }}">
-  <input type="hidden" name="response_type" value="{{ response_type }}">
-  {% if state %}
-  <input type="hidden" name="state" value="{{ state }}">
-  {% endif %}
-  <button type="submit" name="confirm" value="yes" class="btn btn-primary">Allow</button>
-  <button type="submit" name="confirm" value="no" class="btn btn-default">Deny</button>
-</form>
-
-{% endblock %}
-
-{% block scripts %}
-
-<script>
-  var created = new Date("{{ user.created }}");
-  window.onload = function() {
-    $('#user-created').html(created.toString());
-  };
-</script>
-
-{% endblock %}
--- /dev/null
+++ b/swtstore/templates/context/list_contexts.html
@@ -1 +1,21 @@
+{% extends "layout.html" %}
+{% block body %}
+<div>
+  {% if contexts|length > 0 %}
+    <ul>
+    {% for context in contexts %}
+      <div class="well">
+        <div class="pull-right">
+          <span class="glyphicon glyphicon-trash"></span>
+        </div>
+        <div> {{ context.name }} </div>
+        <div> {{ context.definition }} </div>
+      </div>
+    {% endfor %}
+  </ul>
+  {% else %}
+  <em> You haven't registered any contexts yet! </em>
+  {% endif %}
+</div>
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/context/register.html
@@ -1 +1,20 @@
+{% extends "layout.html" %}
+{% block body %}
+<h4> Register a new context with the <i>swt web</i> platform </h4>
+<p class="text-muted"> Please fill in the details below and click Register button </p>
+
+<form role="form" method="POST" action="{{ url_for('context.register') }}">
+  <div class="form-group">
+    <label for="name">Name </label>
+    <input type="text" class="form-control" name="name" id="name" placeholder="Name of the context">
+  </div>
+  <div class="form-group">
+    <label for="defn">Definition</label>
+    <p class="help-block"> JSON-LD definition. Insert a JSON-LD.</p>
+    <textarea class="form-control" rows="4" id="defn" name="defn">
+    </textarea>
+  </div>
+  <button type="submit" class="btn btn-primary">Register</button>
+</form>
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/frontend/index.html
@@ -1 +1,47 @@
+{% extends "layout.html" %}
+
+{% block body %}
+  <div id="store-stats">
+  </div>
+
+  {% if sweets|length > 0 %}
+
+    <ul class="entries unstyled">
+    {% for sweet in sweets %}
+      <li>
+        <span class="who">
+          <a href="#">
+            @{{ sweet.who.username }}
+          </a>
+        </span>
+        <span class="what">
+          <b> #{{ sweet.what.name }} </b>
+        </span>
+        <span class="where">
+          {{ sweet.where }}
+        </span>
+        <p></p>
+        <span class="how">
+          {{ sweet.how|escape|safe }}
+        </span>
+
+        <small><i>created: {{sweet.created }}</i></small>
+
+        <span class="pull-right permalink">
+          <a href="{{ url_for('sweet.showSweet', id=sweet.id) }}">
+          <i class="glyphicon glyphicon-share"></i>
+        </a>
+      </li>
+    {% endfor %}
+    </ul>
+
+  {% else %}
+  <div class="row">
+    <div class="col-md-5">
+      <h4><em>Unbelievable! No sweets yet!!</em></h4>
+    </div>
+  </div>
+  {% endif %}
+
+{% endblock %}
--- a/swtstore/templates/index.html
+++ /dev/null
@@ -1,47 +1 @@
-{% extends "layout.html" %}
-
-{% block body %}
-  <div id="store-stats">
-  </div>
-
-  {% if sweets|length > 0 %}
-
-    <ul class="entries unstyled">
-    {% for sweet in sweets %}
-      <li>
-        <span class="who">
-          <a href="#">
-            @{{ sweet.who.username }}
-          </a>
-        </span>
-        <span class="what">
-          <b> #{{ sweet.what.name }} </b>
-        </span>
-        <span class="where">
-          {{ sweet.where }}
-        </span>
-        <p></p>
-        <span class="how">
-          {{ sweet.how|escape|safe }}
-        </span>
-
-        <small><i>created: {{sweet.created }}</i></small>
-
-        <span class="pull-right permalink">
-          <a href="{{ url_for('sweet.showSweet', id=sweet.id) }}">
-          <i class="glyphicon glyphicon-share"></i>
-        </a>
-      </li>
-    {% endfor %}
-    </ul>
-
-  {% else %}
-  <div class="row">
-    <div class="col-md-5">
-      <h4><em>Unbelievable! No sweets yet!!</em></h4>
-    </div>
-  </div>
-  {% endif %}
-
-{% endblock %}
--- a/swtstore/templates/layout.html
+++ b/swtstore/templates/layout.html
@@ -51,6 +51,11 @@
                   {{ session.email }}
               </small></a>
               </li>
+              <li>
+                <a href="{{ url_for('user.authorizedApps') }}">
+                  My authorized apps
+                </a>
+              </li>
               <li class="divider"></li>
               <li> <a href="#" id="logout"> Logout </a> </li>
             </ul>
--- a/swtstore/templates/list_apps.html
+++ /dev/null
@@ -1,26 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<div>
-  {% if apps|length > 0 %}
-    <ul>
-    {% for app in apps %}
-      <div class="well">
-        <div class="pull-right">
-          <span class="glyphicon glyphicon-trash"></span>
-        </div>
-        <div><h4> {{ app.name }} </h4></div>
-        <div><h5> {{ app.description }} </h5></div>
-        <div>APP ID: {{ app.id }} </div>
-        <div> APP Secret: {{ app.client_secret }} </div>
-        <div>Host URL: {{ app.host_url }} </div>
-        <div>Redirect URL: {{ app.redirect_uris|join(', ') }} </div>
-        <div>Scopes: {{ app.default_scopes|join(', ') }} </div>
-      </div>
-    {% endfor %}
-  </ul>
-  {% else %}
-  <em> You haven't registered any apps yet! </em>
-  {% endif %}
-</div>
-{% endblock %}
--- a/swtstore/templates/list_contexts.html
+++ /dev/null
@@ -1,21 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<div>
-  {% if contexts|length > 0 %}
-    <ul>
-    {% for context in contexts %}
-      <div class="well">
-        <div class="pull-right">
-          <span class="glyphicon glyphicon-trash"></span>
-        </div>
-        <div> {{ context.name }} </div>
-        <div> {{ context.definition }} </div>
-      </div>
-    {% endfor %}
-  </ul>
-  {% else %}
-  <em> You haven't registered any contexts yet! </em>
-  {% endif %}
-</div>
-{% endblock %}
--- a/swtstore/templates/me.html
+++ /dev/null
@@ -1,44 +1 @@
-
-{% extends "layout.html" %}
-{% block body %}
-
-<h4> Update your profile details </h4>
-
-<p class="text-muted"> Please fill in the details below and click update button </p>
-
-<form role="form" method="POST" action="{{ url_for('user.profile') }}">
-  <div class="form-group">
-    <label for="username">Username</label>
-    <input type="text" class="form-control" name="username" id="username"
-    placeholder="Username you are going to use" value="{{ user.username}}">
-  </div>
-  <div class="form-group">
-    <label class="control-label">Email</label>
-    <div class="">
-      <p class="form-control-static">{{ user.email }}</p>
-    </div>
-  </div>
-  <div class="form-group">
-    <label class="control-label">Account created </label>
-    <div class="">
-      <p class="form-control-static" id="user-created">
-      {{ user.created }}
-      </p>
-    </div>
-  </div>
-  <button type="submit" class="btn btn-primary">Update</button>
-</form>
-
-{% endblock %}
-
-{% block scripts %}
-
-<script>
-  var created = new Date("{{ user.created }}");
-  window.onload = function() {
-    $('#user-created').html(created.toString());
-  };
-</script>
-
-{% endblock %}
--- a/swtstore/templates/my_apps.html
+++ /dev/null
@@ -1,26 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<div>
-  {% if apps|length > 0 %}
-    <ul>
-    {% for app in apps %}
-      <div class="well">
-        <div class="pull-right">
-          <span class="glyphicon glyphicon-trash"></span>
-        </div>
-        <div><h4> {{ app.name }} </h4></div>
-        <div><h5> {{ app.description }} </h5></div>
-        <div>APP ID: {{ app.id }} </div>
-        <div> APP Secret: {{ app.client_secret }} </div>
-        <div>Host URL: {{ app.host_url }} </div>
-        <div>Redirect URL: {{ app.redirect_uris|join(', ') }} </div>
-        <div>Scopes: {{ app.default_scopes|join(', ') }} </div>
-      </div>
-    {% endfor %}
-  </ul>
-  {% else %}
-  <em> You haven't registered any apps yet! </em>
-  {% endif %}
-</div>
-{% endblock %}
--- a/swtstore/templates/my_contexts.html
+++ /dev/null
@@ -1,21 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<div>
-  {% if contexts|length > 0 %}
-    <ul>
-    {% for context in contexts %}
-      <div class="well">
-        <div class="pull-right">
-          <span class="glyphicon glyphicon-trash"></span>
-        </div>
-        <div> {{ context.name }} </div>
-        <div> {{ context.definition }} </div>
-      </div>
-    {% endfor %}
-  </ul>
-  {% else %}
-  <em> You haven't registered any contexts yet! </em>
-  {% endif %}
-</div>
-{% endblock %}
--- a/swtstore/templates/my_sweets.html
+++ /dev/null
@@ -1,68 +1 @@
-{% extends "layout.html" %}
-
-{% block body %}
-
-  {% if sweets|length > 0 %}
-
-    <ul class="entries unstyled">
-    {% for sweet in sweets %}
-      <li>
-        <span class="who">
-          <a href="#">
-            @{{ sweet.who.username }}
-          </a>
-        </span>
-        <span class="what">
-          <b> #{{ sweet.what.name }} </b>
-        </span>
-        <span class="where">
-          {{ sweet.where }}
-        </span>
-        <p></p>
-        <span class="how">
-          {{ sweet.how|tojson }}
-        </span>
-
-        <small><i>created: {{sweet.created }}</i></small>
-
-        <span class="pull-right permalink">
-          <a href="#">
-            <i class="glyphicon glyphicon-share"></i>
-          </a>
-        </span>
-        <span class="pull-right edit-sweet" for="{{ sweet.id }}">
-          <a href="#">
-            <i class="glyphicon glyphicon-edit"></i>
-          </a>
-        </span>
-      </li>
-    {% endfor %}
-    </ul>
-
-  {% else %}
-  <div class="row">
-    <div class="col-md-5">
-      <h4><em>Unbelievable! No sweets yet!!</em></h4>
-    </div>
-  </div>
-  {% endif %}
-
-  <div class="modal fade" id="edit-sweet-modal">
-    <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">Edit Sweet </h4>
-        </div>
-        <div class="modal-body"></div>
-        <div
-          class="modal-footer">
-          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
-          <button type="button" class="btn btn-primary" id="save-edited-sweet">Save changes</button>
-        </div>
-      </div><!-- /.modal-content -->
-    </div><!-- /.modal-dialog -->
-  </div><!-- /.modal -->
-
-{% endblock %}
--- a/swtstore/templates/register_app.html
+++ /dev/null
@@ -1,66 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<h4> Register a new app with the <i>swt web</i> platform </h4>
-<p class="text-muted"> Please fill in the details below and click Register button </p>
-
-<form role="form" method="POST" action="{{ url_for('app.register') }}">
-  <div class="form-group">
-    <label for="name">Name </label>
-    <input type="text" class="form-control" name="name" id="name" placeholder="Name of the application">
-  </div>
-  <div class="form-group">
-    <label for="desc">Description</label>
-    <p class="help-block"> Brief description of your application. (Optional)</p>
-    <textarea class="form-control" rows="4" id="desc" name="desc">
-    </textarea>
-  </div>
-  <div class="form-group">
-    <label for="host_url">Host URL</label>
-    <p class="help-block">URL where your app is deployed</p>
-    <input type="text" class="form-control" name="host_url" id="host_url" placeholder="host URL">
-  </div>
-  <div class="form-group">
-    <label for="redirect_uris">Redirect URLs</label>
-    <p class="help-block">Your app URL where it should be redirected once the user is authorized.</p>
-    <input type="text" class="form-control" name="redirect_uris" id="redirect_uris" placeholder="redirect URLs">
-  </div>
-  <div class="form-group">
-    <label for="scopes">Scopes</label>
-    <input type="text" class="form-control" name="scopes" id="scopes" value="email">
-  </div>
-  <button type="submit" class="btn btn-primary">Register</button>
-</form>
-{% endblock %}
-{% block scripts %}
-<script>
-  // form validation
-  /*$('form').on('submit', function(event) {
-    console.log('here..');
-    if(!$('#name').val()) {
-      event.preventDefault();
-      $('#name').parent().addClass('has-feedback');
-      $('#name').parent().addClass('has-error');
-      return false;
-    }
-    if(!$('#host_url').val()) {
-      event.preventDefault();
-      $('#host_url').parent().addClass('has-feedback');
-      $('#name').parent().addClass('has-error');
-      return false;
-    }
-    if(!$('#redirect_uris').val()) {
-      event.preventDefault();
-      $('#redirect_uris').parent().addClass('has-feedback');
-      $('#name').parent().addClass('has-error');
-      return false;
-    }
-    if(!$('#scopes').val()) {
-      event.preventDefault();
-      $('#scopes').parent().addClass('has-feedback');
-      $('#name').parent().addClass('has-error');
-      return false;
-    }
-  });*/
-</script>
-{% endblock %}
--- a/swtstore/templates/register_context.html
+++ /dev/null
@@ -1,20 +1 @@
-{% extends "layout.html" %}
-{% block body %}
-<h4> Register a new context with the <i>swt web</i> platform </h4>
-<p class="text-muted"> Please fill in the details below and click Register button </p>
-
-<form role="form" method="POST" action="{{ url_for('context.register') }}">
-  <div class="form-group">
-    <label for="name">Name </label>
-    <input type="text" class="form-control" name="name" id="name" placeholder="Name of the context">
-  </div>
-  <div class="form-group">
-    <label for="defn">Definition</label>
-    <p class="help-block"> JSON-LD definition. Insert a JSON-LD.</p>
-    <textarea class="form-control" rows="4" id="defn" name="defn">
-    </textarea>
-  </div>
-  <button type="submit" class="btn btn-primary">Register</button>
-</form>
-{% endblock %}
--- a/swtstore/templates/specific_sweet.html
+++ /dev/null
@@ -1,28 +1 @@
-{% extends "layout.html" %}
-
-{% block body %}
-
-<ul class="entries unstyled">
-  <li>
-    <span class="who">
-      <a href="#">
-        @{{ sweet.who.username }}
-      </a>
-    </span>
-    <span class="what">
-      <b> #{{ sweet.what.name }} </b>
-    </span>
-    <span class="where">
-      {{ sweet.where }}
-    </span>
-    <p></p>
-    <span class="how">
-      {{ sweet.how|escape|safe }}
-    </span>
-
-    <small><i>created: {{sweet.created }}</i></small>
-  </li>
-</ul>
-
-{% endblock %}
--- /dev/null
+++ b/swtstore/templates/sweet/specific.html
@@ -1 +1,28 @@
+{% extends "layout.html" %}
+
+{% block body %}
+
+<ul class="entries unstyled">
+  <li>
+    <span class="who">
+      <a href="#">
+        @{{ sweet.who.username }}
+      </a>
+    </span>
+    <span class="what">
+      <b> #{{ sweet.what.name }} </b>
+    </span>
+    <span class="where">
+      {{ sweet.where }}
+    </span>
+    <p></p>
+    <span class="how">
+      {{ sweet.how|escape|safe }}
+    </span>
+
+    <small><i>created: {{sweet.created }}</i></small>
+  </li>
+</ul>
+
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/user/apps.html
@@ -1 +1,26 @@
+{% extends "layout.html" %}
+{% block body %}
+<div>
+  {% if apps|length > 0 %}
+    <ul>
+    {% for app in apps %}
+      <div class="well">
+        <div class="pull-right">
+          <span class="glyphicon glyphicon-trash"></span>
+        </div>
+        <div><h4> {{ app.name }} </h4></div>
+        <div><h5> {{ app.description }} </h5></div>
+        <div>APP ID: {{ app.id }} </div>
+        <div> APP Secret: {{ app.client_secret }} </div>
+        <div>Host URL: {{ app.host_url }} </div>
+        <div>Redirect URL: {{ app.redirect_uris|join(', ') }} </div>
+        <div>Scopes: {{ app.default_scopes|join(', ') }} </div>
+      </div>
+    {% endfor %}
+  </ul>
+  {% else %}
+  <em> You haven't registered any apps yet! </em>
+  {% endif %}
+</div>
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/user/authorized_apps.html
@@ -1 +1,39 @@
+{% extends "layout.html" %}
+{% block body %}
+
+{% if authorized_clients | length > 0 %}
+<h4> Your authorized apps </h4>
+
+<p class="text-muted">
+  You have given access to these apps to post sweets
+  to the swtstore on your behalf. You can revoke access to specific apps.
+</p>
+
+<form role="form" method="POST" action="{{ url_for('user.authorizedApps') }}">
+  <div class="form-group">
+    <ul>
+      {% for client in authorized_clients %}
+        <li class="authorized_apps">
+          <p class="form-control-static">
+            <b>{{ client.name }}</b>: {{ client.description }}
+            <button type="submit" name="revoke-id" value="{{ client.client_id }}"
+              class="btn btn-sm btn-primary pull-right">Revoke Access</button>
+          </p>
+        </li>
+      {% endfor %}
+    </ul>
+  </div>
+</form>
+{% else %}
+<i> You have not authorized any apps to access swtstore yet.</i>
+{% endif %}
+
+{% endblock %}
+
+{% block scripts %}
+
+<script>
+</script>
+
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/user/contexts.html
@@ -1 +1,21 @@
+{% extends "layout.html" %}
+{% block body %}
+<div>
+  {% if contexts|length > 0 %}
+    <ul>
+    {% for context in contexts %}
+      <div class="well">
+        <div class="pull-right">
+          <span class="glyphicon glyphicon-trash"></span>
+        </div>
+        <div> {{ context.name }} </div>
+        <div> {{ context.definition }} </div>
+      </div>
+    {% endfor %}
+  </ul>
+  {% else %}
+  <em> You haven't registered any contexts yet! </em>
+  {% endif %}
+</div>
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/user/me.html
@@ -1 +1,44 @@
+
+{% extends "layout.html" %}
+{% block body %}
+
+<h4> Update your profile details </h4>
+
+<p class="text-muted"> Please fill in the details below and click update button </p>
+
+<form role="form" method="POST" action="{{ url_for('user.profile') }}">
+  <div class="form-group">
+    <label for="username">Username</label>
+    <input type="text" class="form-control" name="username" id="username"
+    placeholder="Username you are going to use" value="{{ user.username}}">
+  </div>
+  <div class="form-group">
+    <label class="control-label">Email</label>
+    <div class="">
+      <p class="form-control-static">{{ user.email }}</p>
+    </div>
+  </div>
+  <div class="form-group">
+    <label class="control-label">Account created </label>
+    <div class="">
+      <p class="form-control-static" id="user-created">
+      {{ user.created }}
+      </p>
+    </div>
+  </div>
+  <button type="submit" class="btn btn-primary">Update</button>
+</form>
+
+{% endblock %}
+
+{% block scripts %}
+
+<script>
+  var created = new Date("{{ user.created }}");
+  window.onload = function() {
+    $('#user-created').html(created.toString());
+  };
+</script>
+
+{% endblock %}
--- /dev/null
+++ b/swtstore/templates/user/sweets.html
@@ -1 +1,68 @@
+{% extends "layout.html" %}
+
+{% block body %}
+
+  {% if sweets|length > 0 %}
+
+    <ul class="entries unstyled">
+    {% for sweet in sweets %}
+      <li>
+        <span class="who">
+          <a href="#">
+            @{{ sweet.who.username }}
+          </a>
+        </span>
+        <span class="what">
+          <b> #{{ sweet.what.name }} </b>
+        </span>
+        <span class="where">
+          {{ sweet.where }}
+        </span>
+        <p></p>
+        <span class="how">
+          {{ sweet.how|tojson }}
+        </span>
+
+        <small><i>created: {{sweet.created }}</i></small>
+
+        <span class="pull-right permalink">
+          <a href="#">
+            <i class="glyphicon glyphicon-share"></i>
+          </a>
+        </span>
+        <span class="pull-right edit-sweet" for="{{ sweet.id }}">
+          <a href="#">
+            <i class="glyphicon glyphicon-edit"></i>
+          </a>
+        </span>
+      </li>
+    {% endfor %}
+    </ul>
+
+  {% else %}
+  <div class="row">
+    <div class="col-md-5">
+      <h4><em>Unbelievable! No sweets yet!!</em></h4>
+    </div>
+  </div>
+  {% endif %}
+
+  <div class="modal fade" id="edit-sweet-modal">
+    <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">Edit Sweet </h4>
+        </div>
+        <div class="modal-body"></div>
+        <div
+          class="modal-footer">
+          <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+          <button type="button" class="btn btn-primary" id="save-edited-sweet">Save changes</button>
+        </div>
+      </div><!-- /.modal-content -->
+    </div><!-- /.modal-dialog -->
+  </div><!-- /.modal -->
+
+{% endblock %}