diff --git a/src/api/Courses.js b/src/api/Courses.js
index b145030..2ec4e6d 100644
--- a/src/api/Courses.js
+++ b/src/api/Courses.js
@@ -1,21 +1,25 @@
 import { Api } from "./Api"
 
 class CoursesClass {
 	get(courseName) {
 		return Api.get(`courses/${courseName}`)
 	}
 
 	getAll(page=1) {
 		if (page === 1) {
 			return Api.get("courses")
 		} else {
 			return Api.get(`courses?page=${page}`)
 		}
 	}
 
 	patch(courseName, course, options) {
 		return Api.patch(`courses/${courseName}`, course, options)
 	}
+
+	patchChapters(courseName, course, options) {
+		return Api.patch(`courses/${courseName}/chapters`, course, options)
+	}
 }
 
 export const Courses = new CoursesClass()
diff --git a/src/components/CourseEditor.vue b/src/components/CourseEditor.vue
index 8d0df94..107cd70 100644
--- a/src/components/CourseEditor.vue
+++ b/src/components/CourseEditor.vue
@@ -1,106 +1,130 @@
 <template lang="pug">
 	.CourseEditor
 		h2 Change course's title
 		br
-		WTLInput.CourseEditor__title(
-			v-model="newCourse.title"
-		)
+		WTLField(grouped=true)
+			WTLInput.CourseEditor__title(
+				v-model="newCourse.title"
+			)
+			WTLButton(
+				@click="patchCourse"
+				icon="done"
+				type="success"
+			) Update course title
 		br
 		br
 		h2 Change chapter order by dragging them
 		hr
 		VueDraggable.CourseEditor__chapters(
-			v-if="newCourse.chapters"
-			v-model="newCourse.chapters"
+			v-if="newChapters"
+			v-model="newChapters"
 			@start="drag=true"
 			@end="drag=false"
 		)
 			.CourseEditor__chapter(
-				v-for="chapter in newCourse.chapters"
+				v-for="chapter in newChapters"
 				:key="chapter._id"
 			) {{ chapter.title }}
 		br
+		WTLButton(
+			@click="patchCourseChapters"
+			icon="done"
+			type="success"
+		) Update chapters order
 		h2 Insert new chapter
 		br
 		WTLInput.CourseEditor__new-chapter(
 			v-model="newChapter.title"
 			placeholder="Chapter's title"
 		)
 		br
-		WTLButton(
-			@click="pushChanges"
-			icon="done"
-			type="success"
-		) Confirm changes
 </template>
 
 <style lang="scss">
 @import "~styles/declarations";
 
 .CourseEditor {
 	padding: 2rem;
 }
 </style>
 
 <script>
 import WTLButton from "components/ui/WTLButton"
 import WTLInput from "components/ui/WTLInput"
 import VueDraggable from "vuedraggable"
 
 export default {
 	name: "CourseEditor",
 	components: { WTLInput, WTLButton, VueDraggable },
 	data() {
 		return {
 			newCourse: {
-				title: this.course.title
-				// chapters: this.course.chapters
+				title: this.course.title,
+				language: this.course.language,
 			},
+			newChapters: this.course.chapters,
 			newChapter: {
 				title: ""
 			},
 			errorMsg: ""
 		}
 	},
 	props: {
 		course: {
 			type: Object,
 			required: true
 		}
 	},
 	mounted() {
 
 	},
 	methods: {
-		pushChanges() {
+		patchCourse() {
 			this.$store.dispatch("PATCH_COURSE", {
 				courseName: this.course._id,
 				course: this.newCourse,
 				options: {
 					headers: {
 						"If-Match": this.course._etag,
 						"Authorization": `bearer ${this.$keycloak.token}`
 					}
 				}
 			}).catch((error) => {
 				return this.$store.dispatch("SET_ERROR", { error: error })
 			})
 		},
+		patchCourseChapters() {
+			this.$store.dispatch("PATCH_COURSE_CHAPTERS", {
+				courseName: this.course._id,
+				course: {
+					...this.course,
+					chapters: this.newChapters
+				},
+				options: {
+					headers: {
+						"If-Match": this.course._etag,
+						"Authorization": `bearer ${this.$keycloak.token}`
+					}
+				}
+			}).catch((error) => {
+				return this.$store.dispatch("SET_ERROR", { error: error })
+			})
+		},
 		pushChapter() {
 			/* this.$store.dispatch("PATCH_COURSE", {
 				courseName: this.course._id,
 				course: this.newCourse,
 				options: {
 					headers: {
 						"If-Match": this.course._etag,
 						"Authorization": `bearer ${this.$keycloak.token}`
 					}
 				}
 			}).catch((error) => {
 				console.log(error)
 				return this.$store.commit("SET_ERROR", { error: error })
 			})*/
 		}
 	}
 }
 </script>
diff --git a/src/store/actions.js b/src/store/actions.js
index 175c5f5..0225efe 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -1,111 +1,118 @@
 import { Categories } from "api/Categories"
 import { Courses } from "api/Courses"
 import { Pages } from "api/Pages"
 import { Chapters } from "api/Chapters"
 import { Polling } from "api/Polling"
 import { Api } from "api/Api"
 
 
 export const actions = {
 	FETCH_HOME({ commit }) {
 		return Api.get("")
 			.then((response) => {
 				commit("SET_NAVIGATION_LINKS", { navigationLinks: response._links })
 			})
 	},
 
 	FETCH_ROOT_CATEGORIES({ commit }) {
 		return Categories.getRootCategories()
 			.then((response) => {
 				commit("SET_ROOT_CATEGORIES", { categories: response.data })
 			})
 	},
 
 	FETCH_CATEGORY({ commit }, { categoryName }) {
 		return Categories.get(categoryName)
 			.then((response) => {
 				commit("SET_CATEGORY", { category: response.data })
 			})
 	},
 
 	FETCH_COURSE({ commit }, { courseName }) {
 		return Courses.get(courseName)
 			.then((response) => {
 				const resp = Object.assign({}, response)
 				commit("SET_COURSE", { course: resp })
 				for (const chapter of resp.chapters) {
 					commit("SET_CHAPTER", { chapter: chapter })
 				}
 				return response
 			}).then((response) => {
 				commit("SET_NAVIGATION_LINKS", { navigationLinks: response._links })
 			})
 	},
 
 	FETCH_COURSES({ commit }, { page }) {
 		return Courses.getAll(page)
 			.then((response) => {
 				const resp = Object.assign({}, response)
 				commit("CLEAR_COURSES")
 				for (const course of resp._items) {
 					commit("SET_COURSE", { course: course })
 				}
 				return response
 			}).then((response) => {
 				commit("SET_NAVIGATION_LINKS", { navigationLinks: response._links })
 				return response
 			}).then((response) => {
 				commit("SET_META", { meta: response._meta })
 			})
 	},
 
 	FETCH_PAGE({ commit }, { pageTitle }) {
 		return Pages.get(pageTitle)
 			.then((response) => {
 				commit("SET_PAGE", { page: response })
 			})
 	},
 
 	FETCH_CHAPTER({ commit }, { chapterName }) {
 		return Chapters.get(chapterName)
 			.then((response) => {
 				const resp = Object.assign({}, response)
 				commit("SET_CHAPTER", { page: resp })
 				for (const page of resp.pages) {
 					commit("SET_PAGE", { page: page })
 				}
 			})
 	},
 
 	START_POLLING({ commit }) {
 		return Polling.start()
 			.then((response) => {
 				const pollingId = response.data.pollingId
 
 				const pollTimer = setInterval(() => {
 					Polling.getStatus(pollingId)
 						.then((response) => {
 							commit("UPDATE_POLLING", { pollingId, progress: response.data.progress })
 						})
 				}, 500)
 
 				commit("CREATE_POLLING", { pollingId, pollTimer })
 			})
 	},
 
 	UPDATE_ACTIVE_REQUESTS({ commit }, { add }) {
 		commit("UPDATE_ACTIVE_REQUESTS", { addNewRequest: add })
 	},
 
 	PATCH_COURSE({ commit, dispatch }, { courseName, course, options }) {
 		return Courses.patch(courseName, course, options)
 			.then((response) => {
 				return dispatch("FETCH_COURSE", { courseName })
 			})
 	},
 
+	PATCH_COURSE_CHAPTERS({ commit, dispatch }, { courseName, course, options }) {
+		return Courses.patchChapters(courseName, course, options)
+			.then((response) => {
+				return dispatch("FETCH_COURSE", { courseName })
+			})
+	},
+
 	SET_ERROR({ commit }, { error }) {
 		commit("EMPTY_ERROR")
 		commit("SET_ERROR", { error: error })
 	}
 }
diff --git a/src/views/Course.vue b/src/views/Course.vue
index 240cd26..0b0f4b7 100644
--- a/src/views/Course.vue
+++ b/src/views/Course.vue
@@ -1,91 +1,91 @@
 <template lang="pug">
 	.view--Course
 		h1 {{ courseName }}
 		WTLButton(
-			v-if="$keycloak.authenticated"
+			v-if="$keycloak && $keycloak.authenticated"
 			@click="toggleEditMode"
 			:type="editModeBtnType"
 		) {{ editModeText }}
 		CourseRenderer(
 			v-if="course && !editMode",
 			:course="course",
 			:showName="false"
 		)
 		CourseEditor(
 			v-if="editMode && course",
 			:course="course"
 		)
 </template>
 
 <style lang="scss">
 .view--Course {
 	h1 {
 		text-align: center;
 		margin-bottom: 1rem;
 	}
 
 	.CourseRenderer {
 		background-color: white;
 		box-shadow: 0 1px 3px rgba(0, 0, 0, 0.1);
 	}
 }
 </style>
 
 <script>
 import CourseRenderer from "components/CourseRenderer"
 import CourseEditor from "components/CourseEditor"
 import WTLButton from "components/ui/WTLButton"
 
 export default {
 	name: "Course",
 	components: { CourseRenderer, CourseEditor, WTLButton },
 	data() {
 		return {
 			editMode: false
 		}
 	},
 	computed: {
 		editModeText() {
 			if (this.editMode) {
 				return "Exit from EDIT MODE"
 			} else {
 				return "Enter EDIT MODE"
 			}
 		},
 		editModeBtnType() {
 			if (this.editMode) {
 				return "warning"
 			} else {
 				return "default"
 			}
 		},
 		courseName() {
 			if (this.course) {
 				return this.course.title
 			} else {
 				return this.$route.params.courseName
 			}
 		},
 		course() {
 			return this.$store.state.courses[this.$route.params.courseName]
 		}
 	},
 	asyncData({ store, route }) {
 		return store.dispatch("FETCH_COURSE", { courseName: route.params.courseName })
 			.catch((error) => {
 				return store.commit("SET_ERROR", { error: error })
 			})
 	},
 	methods: {
 		toggleEditMode() {
 			this.editMode = !this.editMode
 		}
 	},
 	meta() {
 		return {
 			title: this.courseName,
 			description: "This is the meta description for the course page"
 		}
 	}
 }
 </script>