diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index d724b16927..fe12a4a7ad 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -239,8 +239,8 @@
 
       $totalEstimate       = 0;
       $canBatchEdit        = common::hasPriv('story', 'batchEdit');
-      $canBatchClose       = common::hasPriv('story', 'batchClose');
-      $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
+      $canBatchClose       = (common::hasPriv('story', 'batchClose') and $storyType != 'requirement');
+      $canBatchChangeStage = (common::hasPriv('story', 'batchChangeStage') and $storyType != 'requirement');
       $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
       $canBatchToTask      = (common::hasPriv('story', 'batchToTask', $checkObject) and $storyType != 'requirement');
       $canBatchAssignTo    = common::hasPriv($storyType, 'batchAssignTo');
@@ -365,7 +365,7 @@
               echo html::commonButton($lang->close, "data-form-action='$actionLink'");
           }
           ?>
-          <?php if(common::hasPriv('story', 'batchChangeStage')):?>
+          <?php if($canBatchChangeStage):?>
           <div class="btn-group dropup">
             <button data-toggle="dropdown" type="button" class="btn"><?php echo $lang->story->stageAB;?> <span class="caret"></span></button>
             <ul class='dropdown-menu <?php echo count($stories) == 1 ? 'stageBox' : '';?>'>
diff --git a/module/screen/model.php b/module/screen/model.php
index 82f02a2501..74cb9f57ba 100644
--- a/module/screen/model.php
+++ b/module/screen/model.php
@@ -104,6 +104,7 @@ class screenModel extends model
         $config->previewScaleType = 'scrollY';
 
         $componentList = json_decode($screen->scheme);
+        $componentList = json_decode(file_get_contents('/data/nfs/repo/screen/' . $screen->id . '.json'));
         if(empty($componentList)) $componentList = array();
 
         /* Reset height of canvas. */