diff --git a/app/views/admin/courses/edit.html.haml b/app/views/admin/courses/edit.html.haml
index ea003c3..77d62fd 100644
--- a/app/views/admin/courses/edit.html.haml
+++ b/app/views/admin/courses/edit.html.haml
@@ -1,10 +1,13 @@
 %h2.courses_edit_start
   = params["action"].upcase
   Course
-= bootstrap_form_for([:admin , @course]) do |f|
-  .row
-    = f.text_field :name
+= simple_form_for([:admin , @course]) do |f|
+  = f.error_notification
+  .form-inputs
+    = f.input :name
+    = f.input :extra
+    = f.input :start
+
   .form-actions
-    = f.submit :class => "btn btn-success"
-    = link_to t(:back), courses_path, :class => "btn btn-warning"
-.courses_edit_end
+    = f.button :submit
+    = link_to "Back", admin_courses_path, :class => "btn btn-warning"
diff --git a/spec/features/admin/courses_spec.rb b/spec/features/admin/courses_spec.rb
index 285b677..5bf3138 100644
--- a/spec/features/admin/courses_spec.rb
+++ b/spec/features/admin/courses_spec.rb
@@ -11,4 +11,12 @@ describe "Admin Course"  do
     course = create(:course)
     visit_url admin_course_url(course)
   end
+
+  it "creates a course" do
+    visit_url new_admin_course_url
+    fill_in 'course_name', :with => 'kaksi'
+    click_button 'Create Course'
+    expect(page).to have_content("Course created")
+  end
+
 end