diff --git a/module/common/model.php b/module/common/model.php
index f3ccab9128..443cc5c95d 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2205,6 +2205,8 @@ EOD;
 
         if(isset($this->app->user))
         {
+            if(in_array($module, $this->config->programPriv->waterfall) and $this->app->tab == 'project') return true;
+
             $this->app->user = $this->session->user;
             if(!commonModel::hasPriv($module, $method)) $this->deny($module, $method);
         }
diff --git a/module/design/control.php b/module/design/control.php
index d783517a56..f68abb68d9 100644
--- a/module/design/control.php
+++ b/module/design/control.php
@@ -84,18 +84,27 @@ class design extends control
             $this->lang->TRActions .= html::a($this->createLink('design', 'submit', "productID=$productID", '', true), "<i class='icon-plus'></i> {$this->lang->design->submit}", '', "class='btn btn-secondary iframe'");
             $this->lang->TRActions .= '</div>';
         }
-        $this->lang->TRActions .= '<div class="btn-group dropdown">';
-        $this->lang->TRActions .= html::a(inlink('create', "projectID=$projectID&productID=$productID&type=$type"), "<i class='icon-plus'></i> {$this->lang->design->create}", '', "class='btn btn-primary'");
-        $this->lang->TRActions .= "<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span>";
-        $this->lang->TRActions .= '</button>';
-        $this->lang->TRActions .= "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
 
-        if(common::hasPriv('design', 'create'))      $this->lang->TRActions .= '<li>' . html::a($this->createLink('design', 'create', "projectID=$projectID&productID=$productID&type=$type"), $this->lang->design->create, '', "class='btn btn-link'") . '</li>';
-        if(common::hasPriv('design', 'batchCreate')) $this->lang->TRActions .= '<li>' . html::a($this->createLink('design', 'batchCreate', "projectID=$projectID&productID=$productID&type=$type"), $this->lang->design->batchCreate, '', "class='btn btn-link'") . '</li>';
+        if(common::hasPriv('design', 'create') and common::hasPriv('design', 'batchCreate'))
+        {
+            $this->lang->TRActions .= '<div class="btn-group dropdown">';
+            $this->lang->TRActions .= html::a(inlink('create', "projectID=$projectID&productID=$productID&type=$type"), "<i class='icon-plus'></i> {$this->lang->design->create}", '', "class='btn btn-primary'");
+            $this->lang->TRActions .= "<button type='button' class='btn btn-primary dropdown-toggle' data-toggle='dropdown'><span class='caret'></span>";
+            $this->lang->TRActions .= '</button>';
+            $this->lang->TRActions .= "<ul class='dropdown-menu pull-right' id='createActionMenu'>";
 
-        $this->lang->TRActions .= '</ul>';
-        $this->lang->TRActions .= '</div>';
-        $this->lang->TRActions .= '</div>';
+            if(common::hasPriv('design', 'create'))      $this->lang->TRActions .= '<li>' . html::a($this->createLink('design', 'create', "projectID=$projectID&productID=$productID&type=$type"), $this->lang->design->create, '', "class='btn btn-link'") . '</li>';
+            if(common::hasPriv('design', 'batchCreate')) $this->lang->TRActions .= '<li>' . html::a($this->createLink('design', 'batchCreate', "projectID=$projectID&productID=$productID&type=$type"), $this->lang->design->batchCreate, '', "class='btn btn-link'") . '</li>';
+
+            $this->lang->TRActions .= '</ul>';
+            $this->lang->TRActions .= '</div>';
+            $this->lang->TRActions .= '</div>';
+        }
+        else
+        {
+            if(common::hasPriv('design', 'create')) $this->lang->TRActions .= html::a(inlink('create', "projectID=$projectID&productID=$productID&type=$type"), "<i class='icon-plus'></i> {$this->lang->design->create}", '', "class='btn btn-primary'");
+            if(common::hasPriv('design', 'batchCreate')) $this->lang->TRActions .= html::a(inlink('batchCreate', "projectID=$projectID&productID=$productID&type=$type"), "<i class='icon-plus'></i> {$this->lang->design->batchCreate}", '', "class='btn btn-primary'");
+        }
 
         /* Init pager and get designs. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/design/view/browse.html.php b/module/design/view/browse.html.php
index 5fb8fc535d..d080b42d5c 100644
--- a/module/design/view/browse.html.php
+++ b/module/design/view/browse.html.php
@@ -44,7 +44,7 @@
           <tr>
             <td calss="c-id">         <?php printf('%03d', $design->id);?></td>
             <td class="c-type">       <?php echo zget($lang->design->typeList, $design->type);?></td>
-            <td class="c-name" title="<?php echo $design->name;?>"><?php echo html::a($this->createLink('design', 'view', "id={$design->id}"), $design->name);?></td>
+            <td class="c-name" title="<?php echo $design->name;?>"><?php echo common::hasPriv('design', 'view') ? html::a($this->createLink('design', 'view', "id={$design->id}"), $design->name) : $design->name;?></td>
             <td class="c-createdBy">  <?php echo zget($users, $design->createdBy);?></td>
             <td class="c-createdDate"><?php echo substr($design->createdDate, 0, 11);?></td>
             <td class="c-assignedTo"> <?php echo $this->design->printAssignedHtml($design, $users);?></td>