diff --git a/ajax.php b/ajax.php
index e89b81b..220a7ac 100644
--- a/ajax.php
+++ b/ajax.php
@@ -72,7 +72,6 @@ switch ($action) {
 		$job->set('virtual_cluster', cr_get_POST('cluster'));
 		$job->set('workspace', cr_get_POST('workspace'));
 		$job->set('priority', cr_get_POST('priority'));
-		$job->set('image', cr_get_POST('image'));
 		$job->set('run_before', cr_get_POST('run_before'));
 		$job->set('tasks', cr_get_POST('tasks'));
 		$res = job_submit($job);
diff --git a/job.logic.php b/job.logic.php
index 6b1e86f..539bf9d 100644
--- a/job.logic.php
+++ b/job.logic.php
@@ -22,13 +22,13 @@ function job_submit(CRObject $job)
 	}
 	$job->set('created_by', Session::get('uid'));
 	$job->set('created_at', time());
-	$res['errno'] = JobManager::add($job) ? Code::SUCCESS : Code::UNKNOWN_ERROR;
-	$log = new CRObject();
-	$log->set('scope', Session::get('uid'));
-	$log->set('tag', 'job.submit');
-	$content = array('job' => $job, 'response' => $res['errno']);
-	$log->set('content', json_encode($content));
-	CRLogger::log($log);
+//	$res['errno'] = JobManager::add($job) ? Code::SUCCESS : Code::UNKNOWN_ERROR;
+//	$log = new CRObject();
+//	$log->set('scope', Session::get('uid'));
+//	$log->set('tag', 'job.submit');
+//	$content = array('job' => $job, 'response' => $res['errno']);
+//	$log->set('content', json_encode($content));
+//	CRLogger::log($log);
 
 	/* notify YAO-scheduler */
 	$spider = new Spider();
@@ -41,7 +41,7 @@ function job_submit(CRObject $job)
 		$tasks[$i] = $task;
 	}
 	$job->set('tasks', $tasks);
-	$job->set('workspace', $job->getInt('workspace'));
+	$job->set('workspace', $job->get('workspace'));
 	$job->set('virtual_cluster', $job->getInt('virtual_cluster'));
 	$job->set('priority', $job->getInt('priority'));
 	$job->set('run_before', $job->getInt('run_before'));
diff --git a/modals.php b/modals.php
index 8c95d52..1e3766b 100755
--- a/modals.php
+++ b/modals.php
@@ -65,24 +65,17 @@
 						<input type="text" id="form-job-name" class="form-control" maxlength="64"
 						       placeholder="A readable job name" required/>
 					</div>
-					<label>Docker Image</label>
-					<div class="form-group form-group-lg">
-						<label for="form-job-image" class="sr-only">Docker Image</label>
-						<input type="text" id="form-job-image" class="form-control" maxlength="256"
-						       placeholder="eg. yao/tensorflow:1.12" required/>
-					</div>
 					<label>Workspace</label>
 					<div class="form-group form-group-lg">
 						<label for="form-job-workspace" class="sr-only">Workspace</label>
-						<select id="form-job-workspace" class="form-control">
-							<option value="1">Workspace 1</option>
-						</select>
+						<input id="form-job-workspace" type="text" class="form-control"
+						       placeholder="git repo" required/>
 					</div>
 					<label>Virtual Cluster</label>
 					<div class="form-group form-group-lg">
 						<label for="form-job-cluster" class="sr-only">Virtual Cluster</label>
 						<select id="form-job-cluster" class="form-control">
-							<option value="1">Cluster 1</option>
+							<option value="1">default</option>
 						</select>
 					</div>
 					<label>Priority</label>
@@ -95,8 +88,8 @@
 							<option value="1">Low</option>
 						</select>
 					</div>
-					<label>Run Before</label>
-					<div class="form-group form-group-lg">
+					<label class="hidden">Run Before</label>
+					<div class="form-group form-group-lg hidden">
 						<div class='input-group date date-picker'>
 							<label for="form-job-run-before" class="sr-only">Run Before</label>
 							<input type='text' class="form-control" placeholder="Run this job before"
@@ -107,48 +100,56 @@
 							</div>
 						</div>
 					</div>
-					<label>Tasks</label>
-					<div class="" id="form-job-tasks">
+					<label>Environment</label>
+					<div id="form-job-tasks">
 						<div class="row">
-							<div class="col-md-2">
-								<label>Name</label>
+							<div class="col-md-6">
+								<label>Docker Image</label>
 								<div class="form-group">
-									<input type="text" class="form-control" maxlength="32"
-									       placeholder="Task Name & Node Name" required/>
+									<input type="text" class="form-control task-image" maxlength="256"
+									       placeholder="eg. yao/tensorflow:1.12" required/>
 								</div>
 							</div>
-							<div class="col-md-2">
+							<div class="col-md-6">
 								<label>CMD</label>
 								<div class="form-group">
-									<input type="text" class="form-control" maxlength="255"
+									<input type="text" class="form-control task-cmd" maxlength="255"
 									       placeholder="Command to bring up task" required/>
 								</div>
 							</div>
+
+							<div class="col-md-4 hidden">
+								<label>Name</label>
+								<div class="form-group">
+									<input type="text" class="form-control task-name" maxlength="32"
+									       placeholder="Task Name & Node Name" value="node1" required/>
+								</div>
+							</div>
 							<div class="col-md-2">
 								<label>CPU Number</label>
 								<div class="form-group">
-									<input type="number" class="form-control" step="1" min="1"
+									<input type="number" class="form-control task-cpu" step="1" min="1"
 									       placeholder="number of CPU required" required/>
 								</div>
 							</div>
 							<div class="col-md-2">
 								<label>Memory</label>
 								<div class="form-group">
-									<input type="number" class="form-control" step="512" min="512"
+									<input type="number" class="form-control task-mem" step="512" min="512"
 									       placeholder="MB" required/>
 								</div>
 							</div>
 							<div class="col-md-2">
 								<label>GPU Number</label>
 								<div class="form-group">
-									<input type="number" class="form-control" step="1" min="1"
+									<input type="number" class="form-control task-gpu-num" step="1" min="1" value="1"
 									       placeholder="number of GPU cards required" required/>
 								</div>
 							</div>
 							<div class="col-md-2">
 								<label>GPU Memory</label>
 								<div class="form-group">
-									<input type="number" class="form-control" step="512" min="512"
+									<input type="number" class="form-control task-gpu-mem" step="512" min="512"
 									       placeholder="MB" required/>
 								</div>
 							</div>
diff --git a/static/job.js b/static/job.js
index 0d26473..ea658da 100755
--- a/static/job.js
+++ b/static/job.js
@@ -5,7 +5,6 @@ function register_events_job() {
 
 	$("#form-job-submit").click(function (e) {
 		var name = $('#form-job-name').val();
-		var image = $('#form-job-image').val();
 		var workspace = $('#form-job-workspace').val();
 		var cluster = $('#form-job-cluster').val();
 		var priority = $('#form-job-priority').val();
@@ -15,14 +14,14 @@ function register_events_job() {
 		}
 		var tasks = [];
 		$('#form-job-tasks').find('.row').each(function () {
-			var vals = $(this).find('input');
 			var task = {};
-			task['name'] = vals.eq(0).val();
-			task['cmd'] = vals.eq(1).val();
-			task['cpu_number'] = vals.eq(2).val();
-			task['memory'] = vals.eq(3).val();
-			task['gpu_number'] = vals.eq(4).val();
-			task['gpu_memory'] = vals.eq(5).val();
+			task['name'] = $(this).find('.task-name').eq(0).val();
+			task['image'] = $(this).find('.task-image').eq(0).val();
+			task['cmd'] = $(this).find('.task-cmd').eq(0).val();
+			task['cpu_number'] = $(this).find('.task-cpu').eq(0).val();
+			task['memory'] = $(this).find('.task-mem').eq(0).val();
+			task['gpu_number'] = $(this).find('.task-gpu-num').eq(0).val();
+			task['gpu_memory'] = $(this).find('.task-gpu-mem').eq(0).val();
 			tasks.push(task);
 		});
 
@@ -35,7 +34,6 @@ function register_events_job() {
 			type: 'POST',
 			data: {
 				name: name,
-				image: image,
 				workspace: workspace,
 				cluster: cluster,
 				priority: priority,
@@ -95,13 +93,6 @@ function load_jobs(scope) {
 			align: 'center',
 			valign: 'middle',
 			escape: true
-		}, {
-			field: 'image',
-			title: 'Docker Image',
-			align: 'center',
-			valign: 'middle',
-			visible: false,
-			escape: true
 		}, {
 			field: 'workspace',
 			title: 'Workspace',