diff -r fd0bb39a7818 -r 2549a8055bd1 Client/MainForm.cs
--- a/Client/MainForm.cs	Sat Oct 25 13:35:11 2014 +0200
+++ b/Client/MainForm.cs	Sun Oct 26 16:16:57 2014 +0100
@@ -134,7 +134,7 @@
             //TextField top = new TextField(0, textBoxTop.Text, ContentAlignment.MiddleLeft);
             iTextFieldTop.Text = textBoxTop.Text;
             iTextFieldTop.Alignment = Alignment;
-            iClient.SetText(iTextFieldTop);
+            iClient.SetField(iTextFieldTop);
         }
 
         private void buttonSetText_Click(object sender, EventArgs e)
@@ -143,7 +143,7 @@
             //iClient.SetText(1, "Bottom");
             //TextField top = new TextField(0, textBoxTop.Text, ContentAlignment.MiddleLeft);
 
-            iClient.SetTexts(new DataField[]
+            iClient.SetFields(new DataField[]
             {
                 new DataField(0, textBoxTop.Text, Alignment),
                 new DataField(1, textBoxBottom.Text, Alignment)
@@ -179,7 +179,7 @@
 
             DataField field = new DataField(0, bitmap);
             field.ColumnSpan = 2;
-            iClient.SetBitmap(field);
+            iClient.SetField(field);
         }
 
         private void buttonBitmapLayout_Click(object sender, EventArgs e)
@@ -221,12 +221,11 @@
             DataField field = new DataField(0, bitmap);
             //We want our bitmap field to span across two rows
             field.RowSpan = 2;
-            //Send it to our server
-            iClient.SetBitmap(field);
 
             //Set texts
-            iClient.SetTexts(new DataField[]
+            iClient.SetFields(new DataField[]
             {
+                field,
                 new DataField(1, textBoxTop.Text, Alignment),
                 new DataField(2, textBoxBottom.Text, Alignment)
             });