diff --git a/docs/source/user_manual/admin.md b/docs/source/user_manual/admin.md
index 19f87d82331824957c41fbf0cd3957958f197ce2..f06a1fb4c53641ec455e61fd1ac047e56edce738 100644
--- a/docs/source/user_manual/admin.md
+++ b/docs/source/user_manual/admin.md
@@ -10,7 +10,7 @@ In the bottom left you will be able to logout by pressing the "Logga ut" button.
 ## Regions
 
 The regions tab will show all regions.
-You will be able to create a new region by entering its name at the top and click the "+" button.
+To create a new region, enter its name at the top and then click the "+" button.
 
 ![Regions](../_static/regions.png)
 
@@ -18,23 +18,23 @@ You will be able to create a new region by entering its name at the top and clic
 
 The users tab will allow you to see all users, their name, region and role.
 You will also be able to create new users by clicking the "Ny användare" button.
-By click the three dots "..." you will be able to edit or delete that user.
-You will also be able to search for and filter users by region or role.
+By clicking the three dots "..." you will be able to edit or delete that user.
+You will also be able to search for and filter users by their region or role.
 
 ![Users](../_static/users.png)
 
 ## Competitions
 
 The competitions tab will allow you to see all competitions, their name, region and year.
-You will also be able to create new competitions by click the "Ny tävling" button and edit exisiting ones by clicking on their name.
+You will also be able to create a new competition by clicking the "Ny tävling" button or edit exisiting ones by clicking on their name.
 By click on the three dots "..." you will be able to start, show the codes for, copy or delete that competition.
 
 ![Competition manager](../_static/competitions.png)
 
 ### Competition codes
 
-After pressing the three dots "..." for a competition and pressing "Visa koder", all the codes for that competition will be shown.
+By pressing the three dots "..." for a competition and then pressing "Visa koder", all the codes for that competition will be shown.
 Here you will see what view each code is associated with and what the code is.
-You will also be able to generate a new code, copy the code or copy a link to the code that will let other people join, or even host, a competition directly.
+You will also be able to generate a new code, copy the code or copy a link to the code that will let others join, or even host, a competition directly.
 
 ![Showing codes for a competition](../_static/competitions_codes.png)
diff --git a/docs/source/user_manual/editor.md b/docs/source/user_manual/editor.md
index 7a9fd8a1652b8298c36768205f3c410c9e455970..7091cce61b74daabd5bbdc476d3dce7fc6186aa2 100644
--- a/docs/source/user_manual/editor.md
+++ b/docs/source/user_manual/editor.md
@@ -1,31 +1,35 @@
 # Editor
 
+[comment]: # 'Explain where to find the competition name. Perhaps an image or link to Admin?'
+
 After clicking on a competition name you will enter the editor and will be able to edit it.
-The Teknikåttan logo in the top left corner will take you back to the Admin page.
-To the left you will see all slides, a newly created competition will have one empty default slide.
+The Teknikåttan logo in the top left corner will take you back to the Admin page and right under that all slides are shown.
+A newly created competition will have one empty default slide.
 Switch to a different slide by clicking on it.
-In the bottom left corner you will be able to add a new slide.
+In the bottom left corner you will be able to add a new slide using the "Ny sida" button.
 Delete or copy a slide simply by right clicking on it and choosing the appropriate option.
-In the top right corner you will be able to change which view you are see and edit.
+In the top right corner you will be able to change which view you see and edit.
+
+![Editor with competition tab open](../_static/editor_competition.png)
 
 ## Competition settings
 
 To the right you will see the active tab "Tävling", which will show and let you edit everything about the entire competition.
 There you will be able to edit the competition name, add a new team and a background image.
-The background image for the competition will be used for all slids in the competition.
-
-![Editor with competition tab open](../_static/editor_competition.png)
+The background image for the competition will be used for all slides in the competition.
 
 ## Slide settings
 
 If you choose the "Sida" tab, you will be able to edit the current slide.
 In the top right you can change the question type of the current slide.
 For all question types you will be able to add a timer for how long the teams have to answer that question.
-Depending on which type you choose you will have different options below.
+Depending on which type you choose, you will have different options below.
 For this example we will choose multiple choice ("Kryssfråga").
-For this question type you will have the option to add a title to the question and how much score a correct answer on the question will give.
+For this question type you will have the option to add a title to the question and how much many points a correct answer yields.
 For this question type you will also be able to add alternatives, which the teams will be able to choose between during a competition.
 Below that you will be able to add and remove text and image components as well as a background image.
-The background image for the competition can be overridden by explicitly setting one on a specific page.
+The background image for the competition can be overridden by explicitly setting it on a specific page.
 
 ![Editor with slide tab open](../_static/editor_slide.jpg)
+
+[comment]: # 'Perhaps mention right clicking a component to make a copy to another view?'
diff --git a/docs/source/user_manual/login.md b/docs/source/user_manual/login.md
index b019bae9e0f93e2a8fcabb5cea35856e5c3735c8..a2d0c423ebb606ddec3e0338ffed6b81ae32415a 100644
--- a/docs/source/user_manual/login.md
+++ b/docs/source/user_manual/login.md
@@ -15,3 +15,5 @@ You can also choose the "Tävling" tab.
 Here you can enter your six character long code and by pressing the "Anslut till tävling" button you will be able to join a competition.
 
 ![Code login page](../_static/logincode.png)
+
+These codes can be accessed from [Admin](admin.md).
diff --git a/docs/source/user_manual/presentation.md b/docs/source/user_manual/presentation.md
index e8f8b6e186ee65d8726f685cf6c3bd3e4d97eea5..8eece4dc888448ebc04d66b9cfd14c5b8e07ef86 100644
--- a/docs/source/user_manual/presentation.md
+++ b/docs/source/user_manual/presentation.md
@@ -1,26 +1,32 @@
+[comment]: # "Why is this file named 'presentation' but the main headline is 'Active competitions'?"
+
 # Active competitions
 
 There are many different views during a competition.
-Below we describe how to start a competition, how to join a competition and how the different kinds of views work.
+Below it is described how to start a competition, how to join a competition, and how the different kinds of views work.
+
+## Competition codes
+
+You can join a competition with codes.
+This can either be done by pasting the link that can be copied when listing the codes or can be typed by hand in the login page.
+All the views have different purposes and therefore looks a little bit different from one another.
 
 ## Operator
 
-There is two ways to start a competition.
+There are two ways to start a competition.
 The first way is to navigate to the competition manager, press the three dots "..." and press "Starta".
 You will then enter the operator view.
-From here you will be able to go bewteen slides with the "<" and ">" buttons or start the timer, both will be synced between all clients connected to that competition.
+From there you will be able to go bewteen slides with the "<" and ">" buttons or start the timer, both will be synced between all clients connected to that competition.
 You will also be able to view the scores for the teams and view all codes to the competition.
 
 ![Operator view](../_static/operator.jpg)
 
 ## Team
 
-You can also join the competition with codes.
-This can either be done by pasting the link that can be copied when listing the codes or can be typed by hand on the login page.
-All the views have a different purpose and therefore looks a little bit different.
+[comment]: # 'What is meant with "(or the code for one of the teams)"? Doesnt a team have to log in using a code?'
 
 The team view (or the code for one of the teams) will be used by teams.
-It shows the current slide and allows the user to answer questions on the slide that will be saved.
+It shows the current slide (that the operator has decided) and allows the user to answer questions on the slide that will be saved.
 
 ![Team view](../_static/team.jpg)
 
@@ -32,9 +38,11 @@ The audience view will look like the operator view but without the buttons.
 
 ## Judge
 
+[comment]: # 'Update image to show that the current slide is highlighted.'
+
 The judge view will show show the same slide as team view.
-To the left you will be able to move between different slides without affecting the other clients.
-To the right you will see what the teams have answered on every question, how much score each team got on each question, how much they have in total and be able to set the score of a team on the current question.
-In the bottom right you will see instructions for how to correct the current question.
+To the left you will be able to move between different slides without affecting the other clients and will be shown och which slide the operator currently is.
+To the right you will see what the teams have answered on every question, what score each team got on each question, their total score and be able to set the score of a team on any and all questions.
+In the bottom right you will see instructions for how to grade the current question.
 
 ![Judge view](../_static/judge.png)