diff --git a/README.md b/README.md
index fcfc151..2729a66 100644
--- a/README.md
+++ b/README.md
@@ -15,5 +15,3 @@ PHP 5 with enabled OpenSSL and APCu
 * All comments in config file are lost on write.
 * Feature is highly unreliable. You can lose the file. You can have two users writing config simultaneously.
 * Do not use in web environment.
-
-// uses tijsverkoyen / CssToInlineStyles to convert CSS to inline styles
diff --git a/application/classes/Controller/Course.php b/application/classes/Controller/Course.php
index 0905a87..76a3fa4 100644
--- a/application/classes/Controller/Course.php
+++ b/application/classes/Controller/Course.php
@@ -39,12 +39,11 @@ class Controller_Course extends Controller_Layout {
     $this->template = new View_Course_Simple;
     $this->template->controls = array();
     $this->template->title = __('New course');
+    $course = ORM::factory('Course');
+    $letter = ORM::factory('Letter');
     if ($this->request->method() === HTTP_Request::POST) {
-      $course = ORM::factory('Course');
-      $letter = ORM::factory('Letter');
       $course->values($this->request->post(), array('title', 'description'));
-      $letter->subject = $this->request->post('letter_subject');
-      $letter->text = $this->request->post('letter_body');
+      $letter->values($this->request->post(), array('subject', 'text'));
       $course->price = 0;
       $course->period = 1;
       $letter->order = 1;
@@ -78,6 +77,8 @@ class Controller_Course extends Controller_Layout {
         $this->redirect($this->_edit_redirect($course));
       }
     }
+    $this->template->model_letter = $letter;
+    $this->template->model_course = $course;
   }
 
   public function action_edit()
diff --git a/application/classes/View/Course/Simple.php b/application/classes/View/Course/Simple.php
index 6b420cd..a05bcea 100644
--- a/application/classes/View/Course/Simple.php
+++ b/application/classes/View/Course/Simple.php
@@ -4,13 +4,15 @@
  * Simple course and first letter creation view controller
  **/
 class View_Course_Simple extends View_Edit {
+  public $model_course;
+  public $model_letter;
   public function controls_course()
   {
     return array(
       'heading' => __('New course'),
       'controls' => array(
-        Form::textinput('title', '', array('label' => 'Title')),
-        Form::textarea('description', '', array('label' => 'Description'))
+        Form::orm_input($this->model_course, 'title'),
+        Form::orm_textarea($this->model_course, 'description')
       )
     );
   }
@@ -20,8 +22,8 @@ class View_Course_Simple extends View_Edit {
     return array(
       'heading' => __('First letter'),
       'controls' => array(
-        Form::textinput('letter_subject', '', array('label' => 'Subject')),
-        Form::textarea('letter_body', '', array('label' => 'Message body'))
+        Form::orm_input($this->model_letter, 'subject'),
+        Form::orm_textarea($this->model_letter, 'text')
       )
     );
   }