diff --git a/README.md b/README.md
index 1b14006..87cd357 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,14 @@
 ## NEXT
 
-- ステータス周りを簡易表示
-  - progressbarのエラー
-- deploy メモリ周りを現在の仕様に
-- デザインテンプレート載せ替え
-  - スマホでJS動いてない
-- cloudflare
 - react native / expo
-- make restart 最新のコンテナインスタンスをとり直す / deployしなくても最新のイメージをとってる
+- ロックkey のパージができる
+- S3ライフサイクルの初期化
+- KPI通知
+- ロックが解除されない
+  - https://github.com/mhenrixon/sidekiq-unique-jobs/issues/397
+- ecs-cli 深堀
+  - make restart 最新のコンテナインスタンスをとり直す / deployしなくても最新のイメージをとってる
+- staging 環境作る
 
 ## 作業ログ
 
diff --git a/app/frontend/app/controllers/orders_controller.rb b/app/frontend/app/controllers/orders_controller.rb
index 2e60d98..6c40438 100644
--- a/app/frontend/app/controllers/orders_controller.rb
+++ b/app/frontend/app/controllers/orders_controller.rb
@@ -1,9 +1,13 @@
 class OrdersController < ApplicationController
   before_action :welcome_crawler, only: :show
-  before_action :verify_logged_in
-  before_action :verify_active_order_exists, only: :new
-  before_action :verify_active_order_not_exists, only: :show
-  before_action :verify_closing_order_exists, only: :result
+  before_action :require_logged_in
+  before_action :require_active_order_is_non_existent, only: :new
+  before_action :require_active_order_is_existent, only: [:show, :progressbar, :status_dialog]
+  before_action :require_closing_order_is_existent, only: :result
+
+  def new
+    @form = OrderForm.new(order_params)
+  end
 
   def show
     @order = find_order.decorate
@@ -16,10 +20,6 @@ def result
     @order = find_order.decorate
   end
 
-  def new
-    @form = OrderForm.new(order_params)
-  end
-
   def create
     @form = OrderForm.new(order_params)
 
@@ -46,7 +46,7 @@ def confirm
 
   def close
     order = find_order
-    order.close!
+    order.close! if order.may_close?
     redirect_to getstarted_path
   end
 
@@ -65,36 +65,40 @@ def status_dialog
 
   private
 
-  def welcome_crawler
-    return if current_user.present?
-    render 'roots/show'
-  end
-
   def find_order
     Order.user(current_user).active.first
   end
 
-  def verify_logged_in
-    redirect_to root_path if current_user.blank?
+  def order_params
+    params.permit(
+      :collect_method, :archive_url,
+      :start_message, :finish_message,
+      :protect_reply, :protect_favorite, :collect_from, :collect_to,
+    ).merge(user_id: current_user.id)
+  end
+
+  def welcome_crawler
+    return if current_user.present?
+    render 'roots/show'
   end
 
-  def verify_active_order_exists
-    redirect_to order_path if find_order.present?
+  def require_logged_in
+    return if logged_in?
+    redirect_to root_path
   end
 
-  def verify_active_order_not_exists
-    redirect_to new_order_path unless find_order.present?
+  def require_active_order_is_non_existent
+    return if find_order.blank?
+    redirect_to order_path
   end
 
-  def verify_closing_order_exists
-    redirect_to order_path unless find_order.closing?
+  def require_active_order_is_existent
+    return if find_order.present?
+    redirect_to new_order_path
   end
 
-  def order_params
-    params.permit(
-      :collect_method, :archive_url,
-      :start_message, :finish_message,
-      :protect_reply, :protect_favorite, :collect_from, :collect_to,
-    ).merge(user_id: current_user.id)
+  def require_closing_order_is_existent
+    return if find_order.closing?
+    redirect_to order_path
   end
 end
diff --git a/app/frontend/app/views/orders/new/_method.html.haml b/app/frontend/app/views/orders/new/_method.html.haml
index 6e1ec30..7b646c9 100755
--- a/app/frontend/app/views/orders/new/_method.html.haml
+++ b/app/frontend/app/views/orders/new/_method.html.haml
@@ -28,7 +28,6 @@
       %h2.blog-title
         全ツイート履歴
       #twitter-archive-uploader(style='margin-top:20px;')
-        = react_component('Uploader')
       %p
         ダウンロードした<strong>「tweets.zip」</strong>をそのままアップロードしてください<br>
         = link_to usage_path, target: '_blank', style:'text-decoration:underline;' do
diff --git a/build/docker-compose.yml b/build/docker-compose.yml
index 47f89fe..8de706d 100644
--- a/build/docker-compose.yml
+++ b/build/docker-compose.yml
@@ -6,6 +6,7 @@ services:
       dockerfile: build/api/Dockerfile
     image: clean_them_all/api:latest
     container_name: clean_them_all_api
+    env_file: ../.env
     environment:
       RAILS_ENV: production
       RAILS_LOG_TO_STDOUT: 'true'
@@ -21,6 +22,7 @@ services:
       - bundle:/bundle:cached
     depends_on:
       - db
+      - redis
   frontend:
     build:
       context: ../
diff --git a/deployment/Makefile b/deployment/Makefile
index f6e9513..0dc8fde 100644
--- a/deployment/Makefile
+++ b/deployment/Makefile
@@ -16,6 +16,4 @@ setup-cluster:
 	--vpc vpc-0ffee845844d25585 \
 	--subnets subnet-04b4ab206d6625e78,subnet-07588361410320e9c \
 	--security-group sg-031154da5470d733d,sg-04744e60ee6bfb139,sg-01a86733823a315a2 \
-	--instance-role ecsInstanceRole \
-	--keypair default \
-	--force
+	--instance-role ecsInstanceRole
diff --git a/deployment/api/docker-compose.yml b/deployment/api/docker-compose.yml
index 451164d..353caef 100644
--- a/deployment/api/docker-compose.yml
+++ b/deployment/api/docker-compose.yml
@@ -6,6 +6,10 @@ services:
     entrypoint: ["./entrypoint.sh"]
     volumes:
       - bundle:/bundle:cached
+    entrypoint: ["./entrypoint.sh"]
+    command: ["rails", "server", "-b", "0.0.0.0"]
+    ports:
+      - '3000'
     logging:
       driver: awslogs
       options:
diff --git a/deployment/api/ecs-params.yml b/deployment/api/ecs-params.yml
index 4848b28..54341a6 100644
--- a/deployment/api/ecs-params.yml
+++ b/deployment/api/ecs-params.yml
@@ -2,9 +2,9 @@ version: 1
 task_definition:
   ecs_network_mode: bridge
   task_execution_role: ecsTaskExecutionRole
-  task_size:
-    cpu_limit: 512
-    mem_limit: 512
   services:
     app:
       essential: true
+      cpu_shares: 500
+      mem_limit: 500m
+      mem_reservation: 500m
diff --git a/deployment/backend/ecs-params.yml b/deployment/backend/ecs-params.yml
index 7d14b2d..d533f05 100644
--- a/deployment/backend/ecs-params.yml
+++ b/deployment/backend/ecs-params.yml
@@ -5,9 +5,9 @@ task_definition:
   services:
     backend:
       essential: true
-      cpu_shares: 1024
-      mem_limit: 1955m
-      mem_reservation: 512m
+      cpu_shares: 2048
+      mem_limit: 1500m
+      mem_reservation: 1500m
       healthcheck:
         test: "ps ax | grep -v grep | grep sidekiq > /dev/null"
         interval: 5s
diff --git a/deployment/frontend/ecs-params.yml b/deployment/frontend/ecs-params.yml
index b77209a..57ca5bc 100644
--- a/deployment/frontend/ecs-params.yml
+++ b/deployment/frontend/ecs-params.yml
@@ -5,5 +5,6 @@ task_definition:
   services:
     frontend:
       essential: true
-      cpu_shares: 1024
-      mem_reservation: 512m
+      cpu_shares: 500
+      mem_limit: 500m
+      mem_reservation: 500m