diff --git a/app/controllers/api/database.php b/app/controllers/api/database.php
index 66b3d1f29d..83c2120bed 100644
--- a/app/controllers/api/database.php
+++ b/app/controllers/api/database.php
@@ -25,7 +25,6 @@ use Utopia\Audit\Audit;
 use Utopia\Database\Database;
 use Utopia\Database\Document;
 use Utopia\Database\Query;
-use Utopia\Database\Validator\Authorization;
 
 $attributesCallback = function ($attribute, $response, $dbForExternal, $database, $audits) {
     /** @var Utopia\Database\Document $document*/
@@ -114,7 +113,7 @@ $attributesCallback = function ($attribute, $response, $dbForExternal, $database
 
     $audits
         ->setParam('event', 'database.attributes.create')
-        ->setParam('resource', 'database/attributes/'.$attribute->getId())
+        ->setParam('resource', 'database/collection/'.$collection->getId())
         ->setParam('data', $attribute)
     ;
 
@@ -287,6 +286,7 @@ App::get('/v1/database/collections/:collectionId/logs')
 
             $output[$i] = new Document([
                 'event' => $log['event'],
+                'userId' => $log['userId'],
                 'ip' => $log['ip'],
                 'time' => $log['time'],
 
@@ -367,7 +367,7 @@ App::put('/v1/database/collections/:collectionId')
 
         $audits
             ->setParam('event', 'database.collections.update')
-            ->setParam('resource', 'database/collections/'.$collection->getId())
+            ->setParam('resource', 'database/collection/'.$collection->getId())
             ->setParam('data', $collection->getArrayCopy())
         ;
 
@@ -411,7 +411,7 @@ App::delete('/v1/database/collections/:collectionId')
 
         $audits
             ->setParam('event', 'database.collections.delete')
-            ->setParam('resource', 'database/collections/'.$collection->getId())
+            ->setParam('resource', 'database/collection/'.$collection->getId())
             ->setParam('data', $collection->getArrayCopy())
         ;
 
@@ -841,7 +841,7 @@ App::delete('/v1/database/collections/:collectionId/attributes/:attributeId')
 
         $audits
             ->setParam('event', 'database.attributes.delete')
-            ->setParam('resource', 'database/attributes/'.$attribute->getId())
+            ->setParam('resource', 'database/collection/'.$collection->getId())
             ->setParam('data', $attribute->getArrayCopy())
         ;
 
@@ -927,7 +927,7 @@ App::post('/v1/database/collections/:collectionId/indexes')
 
         $audits
             ->setParam('event', 'database.indexes.create')
-            ->setParam('resource', 'database/indexes/'.$index->getId())
+            ->setParam('resource', 'database/collection/'.$collection->getId())
             ->setParam('data', $index->getArrayCopy())
         ;
 
@@ -1070,7 +1070,7 @@ App::delete('/v1/database/collections/:collectionId/indexes/:indexId')
 
         $audits
             ->setParam('event', 'database.indexes.delete')
-            ->setParam('resource', 'database/indexes/'.$index->getId())
+            ->setParam('resource', 'database/collection/'.$collection->getId())
             ->setParam('data', $index->getArrayCopy())
         ;
 
diff --git a/app/views/console/account/index.phtml b/app/views/console/account/index.phtml
index 4ad919cc2b..5b71aa9b93 100644
--- a/app/views/console/account/index.phtml
+++ b/app/views/console/account/index.phtml
@@ -305,7 +305,7 @@
                     <table class="vertical small">
                         <thead>
                             <tr>
-                                <th width="140">Date</th>
+                                <th width="120">Date</th>
                                 <th width="175">Event</th>
                                 <th>Client</th>
                                 <th width="90">Location</th>
diff --git a/app/views/console/database/collection.phtml b/app/views/console/database/collection.phtml
index 35ce5222f1..c96401fa9f 100644
--- a/app/views/console/database/collection.phtml
+++ b/app/views/console/database/collection.phtml
@@ -338,26 +338,27 @@
                 <button class="new-index">Add Index</button>
             </li>
             <li data-state="/console/database/collection/activity?id={{router.params.id}}&project={{router.params.project}}">
-                <h2>Activity <span class="badge" data-ls-bind="1"></span></h2>
+                <h2>Activity <span class="badge" data-ls-bind="{{project-collection-logs.logs.length}}"></span></h2>
 
                 <div
-                    data-service="account.getLogs"
-                    data-scope="console"
-                    data-name="securityLogs"
-                    data-event="load">
+                    data-service="database.getCollectionLogs"
+                    data-param-collection-id="{{router.params.id}}"
+                    data-scope="sdk"
+                    data-event="load"
+                    data-name="project-collection-logs">
 
                     <div class="box">
                         <table class="vertical small">
                             <thead>
                                 <tr>
-                                    <th width="140">Date</th>
+                                    <th width="120">Date</th>
                                     <th width="120">User</th>
                                     <th>Event</th>
                                     <th width="90">Location</th>
                                     <th width="90">IP</th>
                                 </tr>
                             </thead>
-                            <tbody data-ls-loop="securityLogs.logs" data-ls-as="log">
+                            <tbody data-ls-loop="project-collection-logs.logs" data-ls-as="log">
                                 <tr>
                                     <td data-title="Date: "><span data-ls-bind="{{log.time|dateTime}}"></span></td>
                                     <td data-title="User: ">
@@ -404,21 +405,39 @@
                                 <label for="collection-name">Name</label>
                                 <input name="name" id="collection-name" type="text" autocomplete="off" data-ls-bind="{{project-collection.name}}" data-forms-text-direction required placeholder="Collection Name" maxlength="128" />
 
-                                <div class="toggle margin-bottom margin-top" data-ls-ui-open data-button-aria="Open Permissions">
-                                    <i class="icon-plus pull-end margin-top-tiny"></i>
-                                    <i class="icon-minus pull-end margin-top-tiny"></i>
-                                    
-                                    <h3 class="margin-bottom-large">Permissions</h3>
-                                    
-                                    <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
-                                    <input type="hidden" id="collection-read" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{project-collection.$permissions.read}}" placeholder="User ID, Team ID or Role" />
-                                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
-                                                    
-                                    <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
-                                    <input type="hidden" id="collection-write" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{project-collection.$permissions.write}}" placeholder="User ID, Team ID or Role" />
-                                    <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+
+                                <label class="margin-bottom-small">Permissions</label>
+
+                                <p class="text-fade text-size-small">Choose the permissions model for this collection.</p>
+                                
+                                <hr class="margin-top-small" />
+
+                                <div class="row">
+                                    <div class="col span-1"><input type="radio" class="margin-top-no" /></div>
+                                    <div class="col span-11">
+                                        <b>Document Level</b>
+                                        <p class="text-fade margin-top-tiny">Bla bla bla bla bla Bla blabla bla Bla blabla bla Bla blabla bla Bla blaBla bla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla</p>
+                                    </div>
                                 </div>
 
+                                <div class="row">
+                                    <div class="col span-1"><input type="radio" class="margin-top-tiny" /></div>
+                                    <div class="col span-11">
+                                        <b>Collection Level</b>
+                                        <p class="text-fade margin-top-tiny">Bla bla bla Bla blabla bla Bla blabla bla Bla blabla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla Bla bla bla Bla</p>
+
+                                        <label for="collection-read">Read Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</span></label>
+                                        <input type="hidden" id="collection-read" name="read" data-forms-tags data-cast-to="json" data-ls-bind="{{project-collection.$permissions.read}}" placeholder="User ID, Team ID or Role" />
+                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                                                        
+                                        <label for="collection-write">Write Access <span class="text-size-small">(<a data-ls-attrs="href={{env.HOME}}/docs/permissions" target="_blank" rel="noopener">Learn more</a>)</label>
+                                        <input type="hidden" id="collection-write" name="write" data-forms-tags data-cast-to="json" data-ls-bind="{{project-collection.$permissions.write}}" placeholder="User ID, Team ID or Role" />
+                                        <div class="text-fade text-size-xs margin-top-negative-small margin-bottom">Add * for wildcard access</div>
+                                    </div>
+                                </div>
+
+                                <hr class="margin-top-no" />
+
                                 <button>Update</button>
                             </form>
                         </div>
diff --git a/public/dist/scripts/app-all.js b/public/dist/scripts/app-all.js
index 14666270ee..569a6d46f5 100644
--- a/public/dist/scripts/app-all.js
+++ b/public/dist/scripts/app-all.js
@@ -201,11 +201,12 @@ let path='/database/collections/{collectionId}/indexes'.replace('{collectionId}'
 if(typeof type!=='undefined'){payload['type']=type;}
 if(typeof attributes!=='undefined'){payload['attributes']=attributes;}
 if(typeof orders!=='undefined'){payload['orders']=orders;}
-const uri=new URL(this.config.endpoint+path);return yield this.call('post',uri,{'content-type':'application/json',},payload);}),getIndex:(collectionId,indexId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
+console.log(collectionId,indexId,type,attributes,orders);const uri=new URL(this.config.endpoint+path);return yield this.call('post',uri,{'content-type':'application/json',},payload);}),getIndex:(collectionId,indexId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
 if(typeof indexId==='undefined'){throw new AppwriteException('Missing required parameter: "indexId"');}
 let path='/database/collections/{collectionId}/indexes/{indexId}'.replace('{collectionId}',collectionId).replace('{indexId}',indexId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('get',uri,{'content-type':'application/json',},payload);}),deleteIndex:(collectionId,indexId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
 if(typeof indexId==='undefined'){throw new AppwriteException('Missing required parameter: "indexId"');}
-let path='/database/collections/{collectionId}/indexes/{indexId}'.replace('{collectionId}',collectionId).replace('{indexId}',indexId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('delete',uri,{'content-type':'application/json',},payload);})};this.functions={list:(search,limit,offset,orderType)=>__awaiter(this,void 0,void 0,function*(){let path='/functions';let payload={};if(typeof search!=='undefined'){payload['search']=search;}
+let path='/database/collections/{collectionId}/indexes/{indexId}'.replace('{collectionId}',collectionId).replace('{indexId}',indexId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('delete',uri,{'content-type':'application/json',},payload);}),getCollectionLogs:(collectionId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
+let path='/database/collections/{collectionId}/logs'.replace('{collectionId}',collectionId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('get',uri,{'content-type':'application/json',},payload);})};this.functions={list:(search,limit,offset,orderType)=>__awaiter(this,void 0,void 0,function*(){let path='/functions';let payload={};if(typeof search!=='undefined'){payload['search']=search;}
 if(typeof limit!=='undefined'){payload['limit']=limit;}
 if(typeof offset!=='undefined'){payload['offset']=offset;}
 if(typeof orderType!=='undefined'){payload['orderType']=orderType;}
diff --git a/public/dist/scripts/app-dep.js b/public/dist/scripts/app-dep.js
index ebb12681a5..53feccdb03 100644
--- a/public/dist/scripts/app-dep.js
+++ b/public/dist/scripts/app-dep.js
@@ -201,11 +201,12 @@ let path='/database/collections/{collectionId}/indexes'.replace('{collectionId}'
 if(typeof type!=='undefined'){payload['type']=type;}
 if(typeof attributes!=='undefined'){payload['attributes']=attributes;}
 if(typeof orders!=='undefined'){payload['orders']=orders;}
-const uri=new URL(this.config.endpoint+path);return yield this.call('post',uri,{'content-type':'application/json',},payload);}),getIndex:(collectionId,indexId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
+console.log(collectionId,indexId,type,attributes,orders);const uri=new URL(this.config.endpoint+path);return yield this.call('post',uri,{'content-type':'application/json',},payload);}),getIndex:(collectionId,indexId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
 if(typeof indexId==='undefined'){throw new AppwriteException('Missing required parameter: "indexId"');}
 let path='/database/collections/{collectionId}/indexes/{indexId}'.replace('{collectionId}',collectionId).replace('{indexId}',indexId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('get',uri,{'content-type':'application/json',},payload);}),deleteIndex:(collectionId,indexId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
 if(typeof indexId==='undefined'){throw new AppwriteException('Missing required parameter: "indexId"');}
-let path='/database/collections/{collectionId}/indexes/{indexId}'.replace('{collectionId}',collectionId).replace('{indexId}',indexId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('delete',uri,{'content-type':'application/json',},payload);})};this.functions={list:(search,limit,offset,orderType)=>__awaiter(this,void 0,void 0,function*(){let path='/functions';let payload={};if(typeof search!=='undefined'){payload['search']=search;}
+let path='/database/collections/{collectionId}/indexes/{indexId}'.replace('{collectionId}',collectionId).replace('{indexId}',indexId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('delete',uri,{'content-type':'application/json',},payload);}),getCollectionLogs:(collectionId)=>__awaiter(this,void 0,void 0,function*(){if(typeof collectionId==='undefined'){throw new AppwriteException('Missing required parameter: "collectionId"');}
+let path='/database/collections/{collectionId}/logs'.replace('{collectionId}',collectionId);let payload={};const uri=new URL(this.config.endpoint+path);return yield this.call('get',uri,{'content-type':'application/json',},payload);})};this.functions={list:(search,limit,offset,orderType)=>__awaiter(this,void 0,void 0,function*(){let path='/functions';let payload={};if(typeof search!=='undefined'){payload['search']=search;}
 if(typeof limit!=='undefined'){payload['limit']=limit;}
 if(typeof offset!=='undefined'){payload['offset']=offset;}
 if(typeof orderType!=='undefined'){payload['orderType']=orderType;}