diff --git a/README.md b/README.md
index d24722b51..ab321106d 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 1. Replace `<your_account>` with your Github username in the link
-    - [DEMO LINK](https://<your_account>.github.io/js_task_fix_form_DOM/)
+   - [DEMO LINK](https://Vitaligna.github.io/js_task_fix_form_DOM/)
 2. Follow [this instructions](https://mate-academy.github.io/layout_task-guideline/)
-    - Run `npm run test` command to test your code;
-    - Run `npm run test:only -- -n` to run fast test ignoring linter;
-    - Run `npm run test:only -- -l` to run fast test with additional info in console ignoring linter.
+   - Run `npm run test` command to test your code;
+   - Run `npm run test:only -- -n` to run fast test ignoring linter;
+   - Run `npm run test:only -- -l` to run fast test with additional info in console ignoring linter.
 
 ### Task: Auth form fix
 
@@ -12,21 +12,24 @@ Look at this form... Looks like something is missing here. Labels? Placeholders?
 ![Preview](./src/images/preview.png)
 
 Your task is to make script, which fixes problems in this form.
-1) Add `<label>` for inputs.
-2) Add placeholders for each input.
+
+1. Add `<label>` for inputs.
+2. Add placeholders for each input.
 
 Rely on the `name` of the input when writing your script.
 
 You can read about placeholders and labels here:
+
 - [MDN Placeholder attribute](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/Input#attr-placeholder)
 - [MDN Label tag](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/label)
 
 ##### Steps to do this challenge:
-1) Get all `inputs` from `form` tag on the page.
-2) For each `input` element create element `label` with `class` `field-label` (it is needed to apply css styles) and `for` attribute where set `id` of current input. Set `textContent` for label rely on `input` name.
-3) For each `input` set `placeholder` based on `input` name. Capitalize it.
-4) Append `label` elements to the parent container of `input` (do not wrap inputs into the label in this task)
-5) Done.
+
+1. Get all `inputs` from `form` tag on the page.
+2. For each `input` element create element `label` with `class` `field-label` (it is needed to apply css styles) and `for` attribute where set `id` of current input. Set `textContent` for label rely on `input` name.
+3. For each `input` set `placeholder` based on `input` name. Capitalize it.
+4. Append `label` elements to the parent container of `input` (do not wrap inputs into the label in this task)
+5. Done.
 
 Hints: p.2 and p.4 can be done in one loop
 
diff --git a/src/scripts/main.js b/src/scripts/main.js
index a765fdb1d..8127bb35e 100644
--- a/src/scripts/main.js
+++ b/src/scripts/main.js
@@ -1,3 +1,21 @@
 'use strict';
 
-// write code here
+const allInputs = document.querySelectorAll('form input');
+
+allInputs.forEach((input) => {
+  const label = document.createElement('label');
+
+  label.className = 'field-label';
+  label.setAttribute('for', input.id);
+  label.textContent = input.name;
+
+  const capitalizedName =
+    input.name
+      .charAt(0)
+
+      .toUpperCase() + input.name.slice(1);
+
+  input.placeholder = capitalizedName;
+
+  input.parentElement.prepend(label);
+});