diff --git a/project/urls.py b/project/urls.py
index b844398b..126205ad 100644
--- a/project/urls.py
+++ b/project/urls.py
@@ -47,9 +47,8 @@ urlpatterns = [
     path('author-request/success/', TemplateView.as_view(template_name='user/become-author-success.html'), name='author-request-success'),
     path('courses/', CoursesView.as_view(), name='courses'),
     path('course/create', CourseEditView.as_view(), name='course_create'),
-    path('course/create/lessons', CourseEditView.as_view(), name='course_create_lessons'),
-    path('course/create/lessons/new', CourseEditView.as_view(), name='course_create_lessons_new'),
-    path('course/create/lessons/edit/<int:lesson>', CourseEditView.as_view(), name='course_create_lessons_edit'),
+    path('course/<int:pk>/lessons/new', CourseEditView.as_view(), name='course_lessons_new'),
+    path('course/<int:pk>/lessons/<int:lesson>/edit', CourseEditView.as_view(), name='course_lessons_edit'),
     path('course/on-moderation', CourseOnModerationView.as_view(), name='course-on-moderation'),
     path('course/<int:pk>/', CourseView.as_view(), name='course'),
     path('course/<str:slug>/', CourseView.as_view(), name='course'),
diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue
index 0f5ae924..4c46f4b2 100644
--- a/web/src/components/CourseRedactor.vue
+++ b/web/src/components/CourseRedactor.vue
@@ -198,7 +198,7 @@
                         </div>
                         <div class="lessons__subtitle subtitle">{{ lesson.title }}</div>
                         <div class="lessons__row">
-                          <div class="lessons__content">{{ lesson.short_description | linebreaks }}</div>
+                          <div class="lessons__content">{{ lesson.short_description }}</div>
                         </div>
                       </div>
                   </vue-draggable>
@@ -463,18 +463,18 @@
             },
             editLesson(lessonIndex) {
                 this.currentLesson = this.lessons[lessonIndex];
-                history.push("/course/create/lessons/edit/"+this.currentLesson.id);
+                history.push(`/course/${this.course.id}/lessons/${this.currentLesson.id}/edit`);
                 this.viewSection = 'lessons-edit';
             },
             showCourse() {
                 if (this.viewSection !== 'course') {
-                  history.push("/course/create");
+                  history.push(this.course.id ? `/course/${this.course.id}/edit` : "/course/create");
                 }
                 this.viewSection = 'course'
             },
             showLessons() {
                 if (this.viewSection !== 'lessons') {
-                  history.push("/course/create/lessons");
+                  history.push(`/course/${this.course.id}/edit/lessons`);
                 }
                 this.viewSection = 'lessons';
             },
@@ -485,7 +485,7 @@
                     content: [],
                 };
                 if (this.viewSection !== 'lessons-edit') {
-                    history.push("/course/create/lessons/new");
+                    history.push(`/course/${this.course.id}/lessons/new`);
                 }
                 this.viewSection = 'lessons-edit';
                 window.scrollTo(0, 0);
@@ -558,7 +558,7 @@
                 return req;
             },
             goToLessons() {
-                history.push("/course/create/lessons");
+                history.push(`/course/${this.course.id}/edit/lessons`);
                 this.viewSection = 'lessons';
                 this.$nextTick(() => {
                     const elementTop = $('#course-redactor__nav').position().top - 130;
@@ -813,18 +813,17 @@
             },
             updateViewSection(location, action) {
                 //console.log('updateViewSection[action]', action);
-                if (location.pathname === '/course/create/lessons') {
+                if (location.pathname.match(/course\/\d+\/edit\/lessons/)) {
                     this.viewSection = 'lessons';
-                } else if (location.pathname === '/course/create') {
-                    this.viewSection = 'course';
-                } else if (location.pathname === '/course/create/lessons/new') {
+                } else if (location.pathname.match(/course\/\d+\/lessons\/new/)){
                     this.viewSection = 'lessons-edit';
-                } else if (location.pathname.indexOf('/course/create/lessons/edit') !== -1) {
-                    let lessonId = parseInt(location.pathname.split('/').pop());
-                    //console.log('lessonId', lessonId, this.lessons.toString());
-                    //console.log('lessod edit', this.lessons.find((i)=>{return i.id === lessonId}));
+                } else if (location.pathname.match(/course\/\d+\/lessons\/\d+\/edit/)) {
+                    // let lessonId = parseInt(location.pathname.split('/').pop());
+                    const lessonId = +location.pathname.match(/lessons\/(\d+)\/edit/)[1];
                     this.currentLesson = this.lessons.find((i)=>{return i.id === lessonId});
                     this.viewSection = 'lessons-edit';
+                } else {
+                    this.viewSection = 'course';
                 }
             },
             onLessonsChanged() {