Index: branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Order/ContactInformation.cshtml
===================================================================
--- branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Order/ContactInformation.cshtml	(revision 9654)
+++ branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Order/ContactInformation.cshtml	(revision 9654)
@@ -0,0 +1,68 @@
+﻿@model HeuristicLab.Services.Optimization.Web.Models.ContactInformationModel
+@using HeuristicLab.Services.Optimization.Web.Helpers
+@{
+  ViewBag.Title = "ContactInformation";
+}
+<h2>
+  Enter Payment Information</h2>
+@using (Html.BeginForm("SaveContactInformation", "Order")) {
+    
+  <div class="editor-label">
+    @Html.LabelFor(m => m.FirstName)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.FirstName)
+  </div>
+
+  <div class="editor-label">
+    @Html.LabelFor(m => m.LastName)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.LastName)
+  </div>
+  
+  <div class="editor-label">
+    @Html.LabelFor(m => m.Email)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.Email)
+  </div>
+    
+  <div class="editor-label">
+    @Html.LabelFor(m => m.OrganizationName)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.OrganizationName)
+  </div>
+  
+  <div class="editor-label">
+    @Html.LabelFor(m => m.Street)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.Street)
+  </div>
+  
+  <div class="editor-label">
+    @Html.LabelFor(m => m.PostalCode)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.PostalCode)
+  </div>
+  
+    <div class="editor-label">
+    @Html.LabelFor(m => m.City)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.City)
+  </div>
+
+  <div class="editor-label">
+    @Html.LabelFor(m => m.State)
+  </div>
+  <div class="editor-field">
+    @Html.EditorFor(m => m.State)
+  </div>
+  <p>
+    <input type="submit" value="Save payment information" />
+  </p>
+}
Index: branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Order/SaveOrder.cshtml
===================================================================
--- branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Order/SaveOrder.cshtml	(revision 9586)
+++ branches/OaaS/HeuristicLab.Services.Optimization.Web/Views/Order/SaveOrder.cshtml	(revision 9654)
@@ -25,28 +25,76 @@
 
 @if (Model.User.PaymentInformation == null || Model.User.PaymentInformation.Count == 0) {
-  <h2>You didn't specify any payment information yet. Please click @Html.ActionLink("here", "Payment") to enter the information.</h2>
+  <h2>You didn't specify any payment information yet. Please click @Html.ActionLink("here", "Payment")
+    to enter the information.</h2>
+} else {
+  <h2>Choose one of your payment options:</h2>
+  foreach (var pi in Model.User.PaymentInformation) {
+  <p>
+    @Html.Label("PaymentInformationId", string.Format("{0} ({1})", pi.PaymentMethod, pi.CardNumber))
+    @Html.RadioButton("PaymentInformationId", pi.PaymentInformationId)
+  </p>
+  }
+  <h3>Or add payment information by clicking @Html.ActionLink("here", "Payment").</h3>
 }
-else {
-    <h2>Choose one of your payment options:</h2>
-    foreach (var pi in Model.User.PaymentInformation) {
-        <p>
-         @Html.Label("PaymentInformationId", string.Format("{0} ({1})", pi.PaymentMethod, pi.CardNumber))
-         @Html.RadioButton("PaymentInformationId", pi.PaymentInformationId)
-        </p>
-    }
-    <h3>Or add payment information by clicking @Html.ActionLink("here", "Payment").</h3>
-    
-    using (Html.BeginForm("SaveOrder", "Order")) {
-    <h2>How often would you like to be billed?</h2>
-    <p>
-    @Html.RadioButtonForEnum(m => m.BillingPeriod)
-    </p>
-    <h2>Would you like to pay upfront or at the end of the period?</h2>
-    <p>
-    @Html.RadioButtonForEnum(m => m.BillingType)
-    </p>
-     <p>
-        <input type="submit" value="Save order" />
-    </p>
+
+@if (Model.User.ContactInformation == null) { 
+  <h2>You didn't specify any contact information yet. Please click @Html.ActionLink("here", "ContactInformation") 
+  to enter the information.</h2>
+} else { 
+  <h2>Contact Information</h2>
+  
+  <table>
+    <tbody>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.FirstName)</td>
+        <td>@Model.User.ContactInformation.FirstName</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.LastName)</td>
+        <td>@Model.User.ContactInformation.LastName</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.FirstName)</td>
+        <td>@Model.User.ContactInformation.FirstName</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.Email)</td>
+        <td>@Model.User.ContactInformation.Email</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.OrganizationName)</td>
+        <td>@Model.User.ContactInformation.OrganizationName</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.Street)</td>
+        <td>@Model.User.ContactInformation.Street</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.PostalCode)</td>
+        <td>@Model.User.ContactInformation.PostalCode</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.City)</td>
+        <td>@Model.User.ContactInformation.City</td>
+      </tr>
+      <tr>
+        <td>@Html.LabelFor(m => m.User.ContactInformation.State)</td>
+        <td>@Model.User.ContactInformation.State</td>
+      </tr>
+    </tbody>
+  </table>
+  
+  <h3>Edit contact information by clicking @Html.ActionLink("here", "ContactInformation")</h3>
 }
+
+@if ((Model.User.PaymentInformation != null && Model.User.PaymentInformation.Count != 0) && (Model.User.ContactInformation != null)) {
+  using (Html.BeginForm("SaveOrder", "Order")) {
+  <h2>How often would you like to be billed?</h2>
+  <p>@Html.RadioButtonForEnum(m => m.BillingPeriod)</p>
+  
+  <h2>Would you like to pay upfront or at the end of the period?</h2>
+  <p>@Html.RadioButtonForEnum(m => m.BillingType)</p>
+  
+  <p><input type="submit" value="Save order" /></p>
+  }
 }
