diff --git a/templates/basichtml.tpl b/templates/basichtml.tpl
index 9b6e7d8..9a538ad 100644
--- a/templates/basichtml.tpl
+++ b/templates/basichtml.tpl
@@ -1,42 +1,43 @@
-{%- extends 'basic.tpl' -%}
+{%- extends 'null.tpl' -%}
 
 
 
-
-{%  block codecell scoped  %}
+{% block codecell %}
 <div class="cell border-box-sizing code_cell vbox">
-<div class="input hbox">
-<div class="prompt input_prompt">In&nbsp;[{{cell.prompt_number if cell.prompt_number else '&nbsp;'}}]:</div>
-<div class="input_area box-flex1">
-{{ cell.input|highlight -}}
+{{ super() }}
 </div>
+{% endblock codecell %}
+
+{% block input_group -%}
+<div class="input hbox">
+{{super()}}
 </div>
-{% if cell.outputs %}
-{%- for output in cell.outputs -%}
+{% endblock input_group %}
+
+{% block output_group -%}
 <div class="vbox output_wrapper">
 <div class="output vbox">
 <div class="hbox output_area">
-<div class="prompt output_prompt"></div>
-    {%- if output.output_type in ['pyout','stream'] %}
-<div class="output_subarea output_stream output_stdout">
-<pre>{{ output.text }}</pre>
-</div>
-</div>
+{{ super() }}
 </div>
-    {%- elif output.output_type in ['display_data'] %}
-<div class="output_subarea output_display_data">
-{{"# image file: fucking display_data"}}
 </div>
-    {%- elif output.output_type in ['pyerr'] %}
-        {%- for line in output.traceback %}
-{{ line |indent| rm_ansi}}
-        {%- endfor %}
-    {%- endif %}
-{%- endfor -%}
-{% endif %}
 </div>
-</div>
-{% endblock codecell %}
+{% endblock output_group %}
+
+
+{% block in_prompt -%}
+<div class="prompt input_prompt">In&nbsp;[{{cell.prompt_number}}]:</div>
+{%- endblock in_prompt %}
+
+{% block output_prompt -%}
+<div class="prompt output_prompt"></div>
+{% endblock output_prompt %}
+
+{% block input %}
+<div class="input_area box-flex1">
+{{cell.input | highlight }}</div>
+{%- endblock input %}
+
 
 {% block markdowncell scoped -%}
 <div class="text_cell_render border-box-sizing rendered_html">
@@ -59,3 +60,16 @@
 {% block unknowncell scoped %}
 unknown type  {{cell.type}}
 {% endblock unknowncell %}
+
+
+{% block pyout -%}
+<div class="output_subarea output_stream output_stdout">
+<pre>{{output.text}}</pre>
+</div>
+{%- endblock pyout %}
+
+{% block stream -%}
+<div class="output_subarea output_stream output_stdout">
+<pre>{{output.text}}</pre>
+</div>
+{%- endblock stream %}
diff --git a/templates/null.tpl b/templates/null.tpl
index 32f0456..ba572ba 100644
--- a/templates/null.tpl
+++ b/templates/null.tpl
@@ -29,26 +29,32 @@ consider calling super even if block is leave block, we might insert more block 
         {%- block any_cell scoped -%}
             {%- if cell.type in ['code'] -%}
                 {%- block codecell scoped -%}
-                {%- block in_prompt -%}{%- endblock in_prompt -%}
-                {%- block input -%}{%- endblock input -%}
-                {%- if cell.outputs -%}
-                    {%- block output_prompt -%}{%- endblock output_prompt -%}
-                    {%- for output in cell.outputs -%}
-                        {%- if output.output_type in ['pyout'] -%}
-                            {%- block pyout scoped -%}{%- endblock pyout -%}
-                        {%- elif output.output_type in ['stream'] -%}
-                        {%- block stream scoped -%}{%- endblock stream -%}
-                        {%- elif output.output_type in ['display_data'] -%}
-                            {%- block display_data scoped -%}{%- endblock display_data -%}
-                        {%- elif output.output_type in ['pyerr'] -%}
-                            {%- block pyerr scoped -%}
-                            {%- for line in output.traceback -%}
-                                {%- block traceback_line scoped -%}{%- endblock traceback_line -%}
-                            {%- endfor -%}
-                            {%- endblock pyerr -%}
+                    {%- block input_group -%}
+                        {%- block in_prompt -%}{%- endblock in_prompt -%}
+                        {%- block input -%}{%- endblock input -%}
+                    {%- endblock input_group -%}
+                    {%- block output_group -%}
+                        {%- if cell.outputs -%}
+                            {%- block output_prompt -%}{%- endblock output_prompt -%}
+                            {%- block outputs -%}
+                                {%- for output in cell.outputs -%}
+                                    {%- if output.output_type in ['pyout'] -%}
+                                        {%- block pyout scoped -%}{%- endblock pyout -%}
+                                    {%- elif output.output_type in ['stream'] -%}
+                                    {%- block stream scoped -%}{%- endblock stream -%}
+                                    {%- elif output.output_type in ['display_data'] -%}
+                                        {%- block display_data scoped -%}{%- endblock display_data -%}
+                                    {%- elif output.output_type in ['pyerr'] -%}
+                                        {%- block pyerr scoped -%}
+                                        {%- for line in output.traceback -%}
+                                            {%- block traceback_line scoped -%}{%- endblock traceback_line -%}
+                                        {%- endfor -%}
+                                        {%- endblock pyerr -%}
+                                    {%- endif -%}
+                                {%- endfor -%}
+                            {%- endblock outputs -%}
                         {%- endif -%}
-                    {%- endfor -%}
-                {%- endif -%}
+                    {%- endblock output_group -%}
                 {%- endblock codecell -%}
             {%- elif cell.type in ['markdown'] -%}
                 {%- block markdowncell scoped-%}