diff --git a/plugins/ktcore/folder/Permissions.php b/plugins/ktcore/folder/Permissions.php
index 272580d..5d1d867 100644
--- a/plugins/ktcore/folder/Permissions.php
+++ b/plugins/ktcore/folder/Permissions.php
@@ -104,6 +104,29 @@ class KTFolderPermissionsAction extends KTFolderAction {
             $iInheritedFolderId = $oInherited->getId();
             $sInherited = join(" » ", $oInherited->getPathArray());
         }
+        
+        $aConditions = array();
+        $aDynConditions = KTPermissionDynamicCondition::getByPermissionObject($oPO);
+        
+        foreach ($aDynConditions as $oDynCondition) {
+            $g = Group::get($oDynCondition->getGroupId());
+
+            if (PEAR::isError($g)) { continue; }
+            $c = KTSavedSearch::get($oDynCondition->getConditionId());            
+            if (PEAR::isError($c)) { continue; }
+            
+            $aInfo = array(
+                'group' => $g->getName(),
+                'name' => $c->getName(),
+            );
+            $aAssign = $oDynCondition->getAssignment();
+            $perms = array();
+            foreach ($aAssign as $iPermissionId) {
+                $perms[$iPermissionId] = true;
+            }
+            $aInfo['perms'] = $perms;
+            $aConditions[] = $aInfo;
+        }
 
         $aTemplateData = array(
             "context" => $this,
@@ -118,6 +141,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
             "edit" => $bEdit,
             "inherited" => $sInherited,
             'foldername' => $this->oFolder->getName(),
+            'conditions' => $aConditions,             
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -177,7 +201,8 @@ class KTFolderPermissionsAction extends KTFolderAction {
             "aMapPermissionUser" => $aMapPermissionUser,
             "edit" => $bEdit,
             "inherited" => $sInherited,
-            'foldername' => $this->oFolder->getName(),            
+            'foldername' => $this->oFolder->getName(),     
+            "iFolderId" => $this->oFolder->getId(),                   
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -247,13 +272,15 @@ class KTFolderPermissionsAction extends KTFolderAction {
 
         $aTemplateData = array(			       
             "iFolderId" => $this->oFolder->getId(),
-	    'roles' => Role::getList(),
-	    'groups' => Group::getList(),
+	        'roles' => Role::getList(),
+	        'groups' => Group::getList(),
             "conditions" => KTSavedSearch::getConditions(),
             "dynamic_conditions" => $aDynamicConditions,
             'context' => &$this,
             'foldername' => $this->oFolder->getName(),          
-	    'jsonpermissions' => $sJSONPermissions,
+	        'jsonpermissions' => $sJSONPermissions,
+	        'edit' => true,
+	        'permissions' => KTPermission::getList(),
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -390,14 +417,14 @@ class KTFolderPermissionsAction extends KTFolderAction {
         foreach ($aPermissions as $oPermission) {
             $iPermId = $oPermission->getId();
 
-	    print 'permission: ' . $oPermission->getName() . '<br/>';
-	    var_dump(KTUtil::arrayGet($aFoo, $iPermId, false)); print '<br/>';
+	    //print 'permission: ' . $oPermission->getName() . '<br/>';
+	    //var_dump(KTUtil::arrayGet($aFoo, $iPermId, false)); print '<br/>';
 
             $aAllowed = KTUtil::arrayGet($aFoo, $iPermId, array());
             KTPermissionUtil::setPermissionForId($oPermission, $oPO, $aAllowed);
         }
 
-	    exit(0);
+	    //exit(0);
 
         $oTransaction = KTFolderTransaction::createFromArray(array(
             'folderid' => $this->oFolder->getId(),
diff --git a/templates/ktcore/folder/permissions.smarty b/templates/ktcore/folder/permissions.smarty
index e699ece..1e7143e 100644
--- a/templates/ktcore/folder/permissions.smarty
+++ b/templates/ktcore/folder/permissions.smarty
@@ -10,7 +10,9 @@
 {else}
 
 {* otherwise continue *}
-<p>{i18n}Manage security{/i18n}: <a href="{addQS}action=resolved_users&fFolderId={$iFolderId}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a></p>
+<p>{i18n}Manage security{/i18n}: <a href="{addQS}fFolderId={$iFolderId}{/addQS}">{i18n}View permissions overview{/i18n}</a>
+| <a href="{addQS}action=resolved_users&fFolderId={$iFolderId}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a>
+</p>
 
 
 <div class="ktInfo">
diff --git a/templates/ktcore/folder/resolved_permissions_user.smarty b/templates/ktcore/folder/resolved_permissions_user.smarty
index f40e072..71d4f1f 100644
--- a/templates/ktcore/folder/resolved_permissions_user.smarty
+++ b/templates/ktcore/folder/resolved_permissions_user.smarty
@@ -12,7 +12,8 @@ this folder.{/i18n}</p>
 <div class="ktInfo"><p>{i18n}No users have permissions on this item.{/i18n}</p></div>
 {else}
 
-<p>{i18n}Manage security{/i18n}: <a href="{addQS}action=edit&fFolderId={$oFolder->getId()}{/addQS}">{i18n}Edit permissions{/i18n}</a></p>
+<p>{i18n}Manage security{/i18n}: <a href="{addQS}fFolderId={$iFolderId}{/addQS}">{i18n}View permissions overview{/i18n}</a>
+| <a href="{addQS}action=edit&fFolderId={$oFolder->getId()}{/addQS}">{i18n}Edit permissions{/i18n}</a></p>
 
 <table  class="kt_collection"cellspacing="0" cellpadding="0" border="0">
 <thead>
diff --git a/templates/ktcore/folder/view_permissions.smarty b/templates/ktcore/folder/view_permissions.smarty
index a6c921f..2403133 100644
--- a/templates/ktcore/folder/view_permissions.smarty
+++ b/templates/ktcore/folder/view_permissions.smarty
@@ -5,7 +5,8 @@ this specific folder.  Only the roles or groups which have permissions
 assigned are shown.{/i18n}</p> 
 
 {if $edit}
-{i18n}Manage security{/i18n}: <a href="{addQS}action=edit&fFolderId={$oFolder->getId()}{/addQS}">{i18n}Edit permissions{/i18n}</a> | <a href="{addQS}action=resolved_users&fFolderId={$oFolder->getId()}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> 
+{i18n}Manage security{/i18n}: <a href="{addQS}action=edit&fFolderId={$oFolder->getId()}{/addQS}">{i18n}Edit permissions{/i18n}</a> 
+| <a href="{addQS}action=resolved_users&fFolderId={$oFolder->getId()}{/addQS}">{i18n}View resolved permissions for user{/i18n}</a> 
 {/if}
 
 {if $iFolderId != 1}
@@ -69,6 +70,7 @@ assigned are shown.{/i18n}</p>
 
 
 { foreach item=oUser from=$users }
+<tr>
 <td><span class="descriptiveText">{i18n}User: {/i18n}</span> {$oUser->getName()}</td>
   { assign var=iUserId value=$oUser->getId() }
   { foreach item=oPerm from=$permissions }
@@ -100,3 +102,37 @@ value="{$iGroupId}"></td>
 </table>
 { /if }
 
+{ if (!empty($conditions)) }
+<h3>{i18n}Dynamic Conditions{/i18n}</h3>
+<table class="kt_collection" cellpadding="0" cellspacing="0">
+<thead>
+<tr>
+  <th class="title">{i18n}Group{/i18n}</th>
+  <th class="title">{i18n}Condition{/i18n}</th>
+{foreach from=$permissions item=oPerm}
+  <th  class="title" title="{$oPerm->getName()}" class="centered">{$oPerm->getHumanName()}</th>
+{/foreach}
+</tr>
+</thead>
+<tbody>
+{foreach from=$conditions item=aInfo}
+<tr>
+  <td>{$aInfo.group}</td>
+  <td>{$aInfo.name}</td>
+{foreach from=$permissions item=oPerm}
+  {assign var=perm_id value=$oPerm->getId()}
+  { if $aInfo.perms.$perm_id }
+    <td class="centered"><span class="ktAction ktInline ktAllowed">{i18n}Allowed{/i18n}</span></td>
+    { else }
+    <td class="centered"><span class="ktAction ktInline ktDenied">{i18n}Denied{/i18n}</span></td>
+  { /if }  
+{/foreach}
+</tr>
+{/foreach}
+
+</tbody>
+</table>
+{/if}
+
+
+