diff --git a/src/templates/attract/tasks/view_task_embed.jade b/src/templates/attract/tasks/view_task_embed.jade
index a3e4921..cec6fc8 100644
--- a/src/templates/attract/tasks/view_task_embed.jade
+++ b/src/templates/attract/tasks/view_task_embed.jade
@@ -1,39 +1,37 @@
 .attract-form
 	form#task_form(onsubmit="return task_save('{{task._id}}', '{{ url_for('attract.tasks.perproject.save', project_url=project['url'], task_id=task._id) }}')")
 		.input-transparent-group
-			input.input-transparent.task-name(
+			input.input-transparent.item-name(
 				name="name",
-				type=text,
+				type="text",
 				placeholder='Name',
 				value="{{ task.name | hide_none }}")
 
 		.input-transparent-group
 			textarea.input-transparent(
 				name="description",
-				type=text,
+				type="text",
 				placeholder='Description') {{ task.description | hide_none }}
 
-		.row
-			.col-md-6
-				.input-transparent-group
-					label#task-task_type Type:
-					select.input-transparent(name="task_type",aria-describedby="task-task_type")
-						| {% for task_type in attract_props.task_types.attract_shot %}
-						| <option value="{{ task_type }}" {% if task_type == task.properties.task_type %}selected{% endif %}>{{ task_type | undertitle }}</option>
-						| {% endfor %}
-						| {% if task.properties.task_type not in attract_props.task_types.attract_shot %}
-						option(value="{{ task.properties.task_type }}",selected).invalid_task {{ task.properties.task_type | undertitle }}
-						| {% endif %}
+		.input-group-flex
+			.input-transparent-group.field-type
+				label#task-task_type Type:
+				select.input-transparent(name="task_type",aria-describedby="task-task_type")
+					| {% for task_type in attract_props.task_types.attract_shot %}
+					| <option value="{{ task_type }}" {% if task_type == task.properties.task_type %}selected{% endif %}>{{ task_type | undertitle }}</option>
+					| {% endfor %}
+					| {% if task.properties.task_type not in attract_props.task_types.attract_shot %}
+					option(value="{{ task.properties.task_type }}",selected).invalid_task {{ task.properties.task_type | undertitle }}
+					| {% endif %}
 
-			.col-md-6
-				.input-transparent-group
-					label#task-status Status:
-					select.input-transparent(
-						name="status",
-						aria-describedby="task-status")
-						| {% for status in task_node_type.dyn_schema.status.allowed %}
-						| <option value="{{ status }}" {% if status == task.properties.status %}selected{% endif %}>{{ status | undertitle }}</option>
-						| {% endfor %}
+			.input-transparent-group
+				label#task-status Status:
+				select.input-transparent(
+					name="status",
+					aria-describedby="task-status")
+					| {% for status in task_node_type.dyn_schema.status.allowed %}
+					| <option value="{{ status }}" {% if status == task.properties.status %}selected{% endif %}>{{ status | undertitle }}</option>
+					| {% endfor %}
 
 		.input-group-separator
 
@@ -61,3 +59,7 @@
 
 script.
 	$("#assignees").select2();
+
+	if (ProjectUtils.context() == 'shot'){
+		$('.field-type').hide();
+	}