diff --git a/_includes/ingredients.html b/_includes/ingredients.html
index c9f2acc..1839644 100644
--- a/_includes/ingredients.html
+++ b/_includes/ingredients.html
@@ -5,6 +5,20 @@
<{{tag}}>Ingredients{{tag}}>
{% for item in page.ingredients -%}
- - {% if item[0] != 0 %}{% if item[0][0] %}{{ item[0][0] }} to {{ item[0][1] }}{% else %}{{ item[0] }}{% endif %}{% endif %} {%- if item[2] %} {{ item[2] }} of {%- endif %} {{ item[1] }}{% if item[0] == 0 %} to taste{% endif %}
- {% endfor -%}
+ {%- assign tag = "li" -%}
+ {%- if item[3] -%}
+ {%- assign tag = tag | append: " class='optional'" -%}
+ {%- endif -%}
+
+ {%- assign amount = item[0] | append: " " -%}
+ {%- assign end = "" -%}
+ {%- if item[0][0] -%}
+ {%- assign amount = item[0][0] | append: " to " | append: item[0][1] | append: " " -%}
+ {%- elsif item[0] == 0 -%}
+ {%- assign amount = "" -%}
+ {%- assign end = " to taste" -%}
+ {%- endif -%}
+
+ <{{ tag }}>{{ amount }} {%- if item[2] %}{{ item[2] }} of {% endif -%} {{ item[1] }}{{ end }}
+ {% endfor %}
diff --git a/_includes/method.html b/_includes/method.html
index 4fadc58..cd47a59 100644
--- a/_includes/method.html
+++ b/_includes/method.html
@@ -7,6 +7,6 @@
{% for item in page.method -%}
- {{ item }}
- {% endfor -%}
+ {% endfor %}
{%- endif -%}
diff --git a/_layouts/default.html b/_layouts/default.html
index 9ff9a92..6e1c475 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -13,7 +13,7 @@
{{ content }}
- {%- include footer.html -%}
+ {% include footer.html -%}