diff --git a/yqform.etlua b/yqform.etlua
index 5c0dda2..ed36668 100644
--- a/yqform.etlua
+++ b/yqform.etlua
@@ -11,31 +11,51 @@
     <h3>General Information</h3>
     <dl>
       <dt>Name</dt>
-      <dd><%= args.name.v %></dd>
+      <dd>
+	<% if args.name then %>
+	<%= args.name.v %>
+	<% end %>
+      </dd>
       <dt>Avatar</dt>
-      <dd><img src="data:<%= args.avatar.t -%>;base64,<%= encoder(args.avatar.v) %>" /></dd>
+      <dd>
+	<% if args.avatar then %>
+	<img src="data:<%= args.avatar.t -%>;base64,<%= encoder(args.avatar.v) %>" />
+	<% end %>
+      </dd>
       <dt>Is Leader</dt>
       <dd>
 	<% if args.is_leader and args.is_leader.v == "on" then %>
 	<img src="data:image/png;base64,<%= encoder(readfile('yqtemplate/basic_blank.png')) %>" />
 	<% else %>
 	<img src="data:image/png;base64,<%= encoder(readfile('yqtemplate/basic_blank.png')) %>" />
-	<% end %>c
+	<% end %>
       </dd>
     </dl>
     <h3>Classes and Levels</h3>
     <dl>
       <dt>Class 1</dt>
       <dd>
+	<% if args.class1 then %>
 	<img src="data:image/png;base64,<%= encoder(readfile('yqtemplate/'..classes[args.class1].f)) %>" />
+	<%    if args.class1_lvl then %>
 	Lvl <%= args.class1_lvl %>
+	<%    end %>
+	<% end %>
       </dd>
       <dt>Class 2</dt>
       <dd>
+	<% if args.class2 then %>
 	<img src="data:image/png;base64,<%= encoder(readfile('yqtemplate/'..classes[args.class2].f)) %>" />
+	<%    if args.class2_lvl then %>
 	Lvl <%= args.class2_lvl %>
+	<%    end %>
+	<% end %>
+      </dd>
+      <dt>Class leaning</dt><dd>
+	<% if args.class_leaning then %>
+	<%= args.class_leaning %>
+	<% end %>
       </dd>
-      <dt>Class leaning</dt><dd><%= args.class_leaning %></dd>
     </dl>
     <% end %>
     <form method="POST" action="/cgi/yqtemplate" enctype="multipart/form-data">
@@ -49,7 +69,7 @@
       <h2>Classes and Levels</h2>
       <label for="class1">Class 1:</label>
       <select name="class1">
-	<% for k, v in ipairs(classes) do %>
+	<% for k, v in ipairs(classes) do -%>
         <option value="<%= k %>"><%= v.n %></option>
 	<% end %>
       </select>
diff --git a/yqtemplate.lua b/yqtemplate.lua
index b792750..8844d55 100644
--- a/yqtemplate.lua
+++ b/yqtemplate.lua
@@ -50,7 +50,7 @@ return {
 				encoder = require "base64".encode,
 				readfile = utils.readfile,
 				args = args,
-				classes = classes
+				classes = classes,
 				elements = {
 					"Fire", "Water", "Earth", "Air",
 					"Wood", "Electricity", "Metals", "Dreams",