diff --git a/panoramix/bin/panoramix b/panoramix/bin/panoramix
index 461341e8ca198..47b41d5627429 100755
--- a/panoramix/bin/panoramix
+++ b/panoramix/bin/panoramix
@@ -7,20 +7,18 @@ import json
 from subprocess import Popen
 
 from flask.ext.script import Manager
+from panoramix import app
 from flask.ext.migrate import MigrateCommand
 from panoramix import db
+from flask.ext.appbuilder import Base
 from sqlalchemy import Column, Integer, String, Table, DateTime
-
-from panoramix import app
-from panoramix import models
-
+from panoramix import models, utils
 
 config = app.config
 
 manager = Manager(app)
 manager.add_command('db', MigrateCommand)
 
-from flask.ext.appbuilder import Base
 
 @manager.option(
     '-d', '--debug', action='store_true',
@@ -45,6 +43,11 @@ def runserver(debug, port):
         print("Starting server with command: " + cmd)
         Popen(cmd, shell=True).wait()
 
+@manager.command
+def init():
+    """Inits the Panoramix application"""
+    utils.init()
+
 @manager.option(
     '-s', '--sample', action='store_true',
     help="Only load 1000 rows (faster, used for testing)")
@@ -108,7 +111,7 @@ def load_examples(sample):
     session.commit()
 
     print("Creating table reference")
-    TBL = models.Table
+    TBL = models.SqlaTable
     obj = session.query(TBL).filter_by(table_name='birth_names').first()
     if not obj:
         obj = TBL(table_name = 'birth_names')
diff --git a/panoramix/models.py b/panoramix/models.py
index 3c3a24b4878b5..14fb39b0d6a78 100644
--- a/panoramix/models.py
+++ b/panoramix/models.py
@@ -8,8 +8,8 @@
 from pydruid.utils.filters import Dimension, Filter
 from sqlalchemy import (
     Column, Integer, String, ForeignKey, Text, Boolean, DateTime)
-from sqlalchemy import Table as sqlaTable
-from sqlalchemy import create_engine, MetaData, desc, select, and_, Table
+from sqlalchemy import Table
+from sqlalchemy import create_engine, MetaData, desc, select, and_
 from sqlalchemy.orm import relationship
 from sqlalchemy.sql import table, literal_column, text
 from flask import request
@@ -55,7 +55,7 @@ class Slice(Model, AuditMixinNullable):
     params = Column(Text)
 
     table = relationship(
-        'Table', foreign_keys=[table_id], backref='slices')
+        'SqlaTable', foreign_keys=[table_id], backref='slices')
     druid_datasource = relationship(
         'Datasource', foreign_keys=[druid_datasource_id], backref='slices')
 
@@ -184,13 +184,13 @@ def get_sqla_engine(self):
 
     def get_table(self, table_name):
         meta = MetaData()
-        return sqlaTable(
+        return Table(
             table_name, meta,
             autoload=True,
             autoload_with=self.get_sqla_engine())
 
 
-class Table(Model, Queryable, AuditMixinNullable):
+class SqlaTable(Model, Queryable, AuditMixinNullable):
     type = "table"
 
     __tablename__ = 'tables'
@@ -207,6 +207,12 @@ class Table(Model, Queryable, AuditMixinNullable):
     def __repr__(self):
         return self.table_name
 
+    @property
+    def perm(self):
+        return (
+            "[{self.database}].[{self.table_name}]"
+            "(id:{self.id})").format(self=self)
+
     @property
     def name(self):
         return self.table_name
@@ -519,7 +525,7 @@ class SqlMetric(Model, AuditMixinNullable):
     metric_type = Column(String(32))
     table_id = Column(Integer, ForeignKey('tables.id'))
     table = relationship(
-        'Table', backref='metrics', foreign_keys=[table_id])
+        'SqlaTable', backref='metrics', foreign_keys=[table_id])
     expression = Column(Text)
     description = Column(Text)
 
@@ -528,7 +534,8 @@ class TableColumn(Model, AuditMixinNullable):
     __tablename__ = 'table_columns'
     id = Column(Integer, primary_key=True)
     table_id = Column(Integer, ForeignKey('tables.id'))
-    table = relationship('Table', backref='columns', foreign_keys=[table_id])
+    table = relationship(
+        'SqlaTable', backref='columns', foreign_keys=[table_id])
     column_name = Column(String(256))
     is_dttm = Column(Boolean, default=True)
     is_active = Column(Boolean, default=True)
diff --git a/panoramix/static/panoramix.css b/panoramix/static/panoramix.css
index 2cdf80dc592a9..a75335c163768 100644
--- a/panoramix/static/panoramix.css
+++ b/panoramix/static/panoramix.css
@@ -31,7 +31,7 @@ form div {
   font-size: 80px;
 }
 .index .carousel-caption p {
-  font-size: 25px;
+  font-size: 20px;
 }
 .index div.carousel-caption{
   background: rgba(0,0,0,0.5);
diff --git a/panoramix/static/panoramix.js b/panoramix/static/panoramix.js
index a7a59271cf4fe..7d97d273e1b98 100644
--- a/panoramix/static/panoramix.js
+++ b/panoramix/static/panoramix.js
@@ -64,7 +64,7 @@ function initializeDatasourceView() {
     }
   })
   add_filter();
-  $("#druidify").click(druidify);
+  $(".druidify").click(druidify);
 
   function create_choices(term, data) {
     var filtered = $(data).filter(function() {
diff --git a/panoramix/templates/index.html b/panoramix/templates/index.html
index 9551ad490012b..ab2339fe91e15 100644
--- a/panoramix/templates/index.html
+++ b/panoramix/templates/index.html
@@ -28,8 +28,8 @@ <h1>Panoramix</h1>
     <div class="item">
       <img src="{{ url_for("static", filename="img/bubble.png") }}">
       <div class="carousel-caption">
-        <h1>Explore your data
-        </h1>
+        <h2>Explore your data
+        </h2>
         <p>
           Intuitively navigate your data while slicing, dicing, and
           visualizing through a rich set of widgets
@@ -39,21 +39,21 @@ <h1>Explore your data
     <div class="item">
       <img src="{{ url_for("static", filename="img/dash.png") }}">
       <div class="carousel-caption">
-        <h1>Create and share dashboards</h1>
+        <h2>Create and share dashboards</h2>
         <p>Assemble many data visualization "slices" into a rich collection</p>
       </div>
     </div>
     <div class="item">
       <img src="{{ url_for("static", filename="img/cloud.png") }}">
       <div class="carousel-caption">
-        <h1>Extend</h1>
+        <h2>Extend</h2>
         <p>Join the community and take part in extending the widget library</p>
       </div>
     </div>
     <div class="item">
       <img src="{{ url_for("static", filename="img/servers.jpg") }}">
       <div class="carousel-caption">
-        <h1>Connect</h1>
+        <h2>Connect</h2>
         <p>
           Access data from MySql, Presto.db, Postgres, RedShift, Oracle, MsSql,
           SQLite, and more through the SqlAlchemy integration. You can also
diff --git a/panoramix/templates/panoramix/datasource.html b/panoramix/templates/panoramix/datasource.html
index cedb23deaaf48..2838585d6ca3c 100644
--- a/panoramix/templates/panoramix/datasource.html
+++ b/panoramix/templates/panoramix/datasource.html
@@ -8,11 +8,16 @@
       <h3>
         {{ datasource.name }}
         {% if datasource.description %}
-        <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{ datasource.description }}"></i>
+          <i class="fa fa-info-circle" data-toggle="tooltip" data-placement="bottom" title="{{ datasource.description }}"></i>
         {% endif %}
-        <a href="/{{ datasource.baselink }}/edit/{{ datasource.id }}">
-          <i class="fa fa-edit"></i>
-        </a>
+        <div class="btn-group pull-right" role="group" >
+          <a class="btn btn-default" href="/{{ datasource.baselink }}/edit/{{ datasource.id }}" data-toggle="tooltip" title="Edit datasource">
+            <i class="fa fa-edit"></i>
+          </a>
+          <button type="button" class="btn btn-default druidify" data-toggle="tooltip" title="Druidify!">
+            <i class="fa fa-bolt"></i>
+          </button>
+        </div>
       </h3>
 
       <hr>
@@ -68,7 +73,7 @@ <h4>Filters</h4>
           <span class="glyphicon glyphicon-plus" aria-hidden="true"></span>
         </button>
         <hr>
-        <button type="button" class="btn btn-primary" id="druidify">
+        <button type="button" class="btn btn-primary druidify">
           <i class="fa fa-bolt"></i>
           Druidify!
         </button>
diff --git a/panoramix/utils.py b/panoramix/utils.py
index 3fc1645173fe3..0a9fa621f34aa 100644
--- a/panoramix/utils.py
+++ b/panoramix/utils.py
@@ -1,10 +1,11 @@
-from datetime import date, datetime, timedelta
+from datetime import datetime
 from dateutil.parser import parse
 import hashlib
 from sqlalchemy.types import TypeDecorator, TEXT
 import json
 import parsedatetime
 import functools
+from panoramix import db
 
 
 class memoized(object):
@@ -62,6 +63,12 @@ def dttm_from_timtuple(d):
         d.tm_year, d.tm_mon, d.tm_mday, d.tm_hour, d.tm_min, d.tm_sec)
 
 
+def merge_perm(sm, permission_name, view_menu_name):
+    pv = sm.find_permission_view_menu(permission_name, view_menu_name)
+    if not pv:
+        sm.add_permission_view_menu(permission_name, view_menu_name)
+
+
 def parse_human_timedelta(s):
     """
     Use the parsedatetime lib to return ``datetime.datetime`` from human
@@ -78,7 +85,6 @@ def parse_human_timedelta(s):
     return d - dttm
 
 
-
 class JSONEncodedDict(TypeDecorator):
     """Represents an immutable structure as a json-encoded string."""
     impl = TEXT
@@ -93,6 +99,7 @@ def process_result_value(self, value, dialect):
             value = json.loads(value)
         return value
 
+
 def color(s):
     """
     Get a consistent color from the same string using a hash function
@@ -109,3 +116,48 @@ def color(s):
     h = hashlib.md5(s)
     i = int(h.hexdigest(), 16)
     return colors[i % len(colors)]
+
+
+def init():
+    """
+    Inits the Panoramix application with security roles and such
+    """
+    from panoramix import appbuilder
+    from panoramix import models
+    from flask_appbuilder.security.sqla import models as ab_models
+    sm = appbuilder.sm
+    alpha = sm.add_role("Alpha")
+
+    merge_perm(sm, 'all_datasource_access', 'all_datasource_access')
+
+    perms = db.session.query(ab_models.PermissionView).all()
+    for perm in perms:
+        if perm.view_menu.name not in (
+                'UserDBModelView', 'RoleModelView', 'ResetPasswordView',
+                'Security'):
+            sm.add_permission_role(alpha, perm)
+    gamma = sm.add_role("Gamma")
+    for perm in perms:
+        s = perm.permission.name
+        if(
+                perm.view_menu.name not in (
+                    'UserDBModelView',
+                    'RoleModelView',
+                    'ResetPasswordView',
+                    'Security') and
+                perm.permission.name not in (
+                    'can_edit',
+                    'can_add',
+                    'can_save',
+                    'can_download',
+                    'muldelete',
+                    'all_datasource_access',
+                )):
+            sm.add_permission_role(gamma, perm)
+    session = db.session()
+    table_perms = [
+            table.perm for table in session.query(models.SqlaTable).all()]
+    table_perms += [
+            table.perm for table in session.query(models.Datasource).all()]
+    for table_perm in table_perms:
+        merge_perm(sm, 'datasource_access', table.perm)
diff --git a/panoramix/views.py b/panoramix/views.py
index 91771f76722d1..bb5b4357225df 100644
--- a/panoramix/views.py
+++ b/panoramix/views.py
@@ -2,7 +2,7 @@
 import json
 import logging
 
-from flask import request, redirect, flash, Response
+from flask import request, redirect, flash, Response, g
 from flask.ext.appbuilder import ModelView, CompactCRUDMixin, BaseView, expose
 from flask.ext.appbuilder.actions import action
 from flask.ext.appbuilder.models.sqla.interface import SQLAInterface
@@ -11,7 +11,7 @@
 from sqlalchemy import create_engine
 from wtforms.validators import ValidationError
 
-from panoramix import appbuilder, db, models, viz, utils, app
+from panoramix import appbuilder, db, models, viz, utils, app, sm
 
 config = app.config
 
@@ -116,7 +116,7 @@ class DatabaseView(PanoramixModelView, DeleteMixin):
 
 
 class TableView(PanoramixModelView, DeleteMixin):
-    datamodel = SQLAInterface(models.Table)
+    datamodel = SQLAInterface(models.SqlaTable)
     list_columns = ['table_link', 'database']
     add_columns = ['table_name', 'database', 'default_endpoint']
     edit_columns = [
@@ -124,10 +124,17 @@ class TableView(PanoramixModelView, DeleteMixin):
     related_views = [TableColumnInlineView, SqlMetricInlineView]
 
     def post_add(self, table):
-        table.fetch_metadata()
+        try:
+            table.fetch_metadata()
+        except Exception as e:
+            flash(
+            "Table [{}] doesn't seem to exist, "
+            "couldn't fetch metadata".format(table.table_name),
+            "danger")
+        utils.merge_perm(sm, 'datasource_access', table.perm)
 
     def post_update(self, table):
-        table.fetch_metadata()
+        self.post_add(table)
 
 appbuilder.add_view(
     TableView,
@@ -203,10 +210,10 @@ class DatasourceModelView(PanoramixModelView, DeleteMixin):
 
     def post_add(self, datasource):
         datasource.generate_metrics()
+        utils.merge_perm(sm, 'datasource_access', table.perm)
 
     def post_update(self, datasource):
-        datasource.generate_metrics()
-
+        self.post_add(datasource)
 
 appbuilder.add_view(
     DatasourceModelView,
@@ -229,6 +236,30 @@ class Panoramix(BaseView):
     @has_access
     @expose("/datasource/<datasource_type>/<datasource_id>/")
     def datasource(self, datasource_type, datasource_id):
+        if datasource_type == "table":
+            datasource = (
+                db.session
+                .query(models.SqlaTable)
+                .filter_by(id=datasource_id)
+                .first()
+            )
+        else:
+            datasource = (
+                db.session
+                .query(models.Datasource)
+                .filter_by(id=datasource_id)
+                .first()
+            )
+
+            all_datasource_access = self.appbuilder.sm.has_access(
+                'all_datasource_access', 'all_datasource_access')
+            datasource_access = self.appbuilder.sm.has_access(
+                'datasource_access', datasource.perm)
+            if not all_datasource_access or not datasource_access:
+                flash(
+                    "You don't seem to have access to this datasource",
+                    "danger")
+                return redirect('/slicemodelview/list/')
         action = request.args.get('action')
         if action == 'save':
             session = db.session()
@@ -263,22 +294,8 @@ def datasource(self, datasource_type, datasource_id):
             session.add(obj)
             session.commit()
             flash("Slice <{}> has been added to the pie".format(slice_name), "info")
-            redirect(obj.slice_url)
+            return redirect(obj.slice_url)
 
-        if datasource_type == "table":
-            datasource = (
-                db.session
-                .query(models.Table)
-                .filter_by(id=datasource_id)
-                .first()
-            )
-        else:
-            datasource = (
-                db.session
-                .query(models.Datasource)
-                .filter_by(id=datasource_id)
-                .first()
-            )
 
         if not datasource:
             flash("The datasource seem to have been deleted", "alert")
diff --git a/tests/core_tests.py b/tests/core_tests.py
index 24848d8ba0f7c..49d10d4ae5a47 100644
--- a/tests/core_tests.py
+++ b/tests/core_tests.py
@@ -4,9 +4,8 @@
 import urllib2
 os.environ['PANORAMIX_CONFIG'] = 'tests.panoramix_test_config'
 from flask.ext.testing import LiveServerTestCase, TestCase
-from flask_login import login_user
 
-from panoramix import app, appbuilder, db, models
+from panoramix import app, db, models, utils
 BASE_DIR = app.config.get("BASE_DIR")
 cli = imp.load_source('cli', BASE_DIR + "/bin/panoramix")
 
@@ -21,6 +20,9 @@ def create_app(self):
     def setUp(self):
         pass
 
+    def test_init(self):
+        utils.init()
+
     def test_load_examples(self):
         cli.load_examples(sample=True)