--- a/editor.css	Mon Apr 02 22:28:48 2012 -0700
+++ b/editor.css	Wed Apr 04 23:15:00 2012 -0700
@@ -11,6 +11,11 @@
 	margin: 0;
 }
 
+*
+{
+	vertical-align: top;
+}
+
 .controls
 {
 	width: 15%;
@@ -18,7 +23,6 @@
 	display: inline-block;
 	padding: 0;
 	margin: 0;
-	vertical-align: top;
 }
 
 #src
@@ -123,37 +127,51 @@
 	display: inline-block;
 }
 
+.object
+{
+	display: inline;
+}
+
+.object > *
+{
+	margin-left: 2em;
+}
 
 .object:before
 {
-	content: '#';
+	content: '#{';
+}
+
+.object:after
+{
+	content: '}';
+	display: block;
 }
 
 .lambda
 {
-	padding-left: 2em;
-}
-
-.lambda > *
-{
-	vertical-align: top;
+	display: inline;
 }
 
 .lambdabody
 {
-	display: inline-block;
+	display: block;
 	margin-left: 2em;
 }
-
-.lambdabody:before
+.args
+{
+	display: inline-block;
+}
+.args:after
 {
 	content: '{';
 }
 
-.lambda:after
+.lambdabody:after
 {
 	display: block;
 	content: '}';
+	margin-left: -2em;
 }
 
 .funcall > .funcall, .assignment > .funcall
@@ -175,3 +193,8 @@
 {
 	color: #FF1030;
 }
+
+.op > div
+{
+	display: inline-block;
+}