diff --git a/build/_assets/javascripts/feedback-form.js b/build/_assets/javascripts/feedback-form.js
index f4ba11ee1..f146f0b5c 100644
--- a/build/_assets/javascripts/feedback-form.js
+++ b/build/_assets/javascripts/feedback-form.js
@@ -1,195 +1,391 @@
-//This is the companion JS code of the _includes/feedback-form.html
-//documentation feedback form. This copy serves as a backup. 
-//Normally, it resides on a CDN referenced from _includes/feedback-form.html.
-
 $(document).ready(function () {
-	var cookieVariablesNames = ['feedbackSubmitted','path','uuid'];
-	var defaultFormValues = {
-		email: "",
-		textFeedback: "",
-		inaccurateContent: false,
-		wrongInformation: false,
-		insufficientInformation: false,
-		textErrors: false,
-		outdatedSample: false,
-	};
-	var formIsProcessing = false;
-	//Util functions
-	var generateUUID = function () {
-		return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
-			var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
-			return v.toString(16);
+	
+		var Feedback = {};
+	
+		var $window = $(window);
+	
+		var cookieVariablesNames = ['feedbackSubmitted', 'path', 'uuid'];
+		var defaultFormValues = {
+			email: "",
+			inaccurateContent: false,
+			inaccurateOutdatedContentText: "",
+			otherMoreInformation: false,
+			otherMoreInformationText: "",
+			textErrors: false,
+			typosLinksElementsText: "",
+			outdatedSample: false,
+			inaccurateOutdatedCodeSamplesText: "",
+			otherFeedback: false,
+			textFeedback: ""
+		};
+	
+		$("#feedback-checkbox-area").click(function (e) {
+			$("span.k-tooltip-validation").remove();
 		});
-	};
-
-	var getCookieByName = function(name) {
-		//This is a very crude, but necessary because currently there is somekind of url rewriting going on
-		//so the cookies are set for a base path but then additional navigation is done with url rewriting
-		//so we set the cookie name as complete path to avoid a problem where the cookie is set for multiple pages.
-		if(name === "yesNoFeedback"){
-			name = currentPath;
-		}
-		var match = document.cookie.match(new RegExp(name + '=([^;]+)'));
-		if (match) return match[1];
-	};
-
-	//Init utility variables
-	var currentPath = $(location).attr('href');
-	var popupNotification = $("#popupNotification").kendoNotification().data("kendoNotification");
-	var formPopupNotification = $("#feedback-form-popup-container").kendoNotification({
-		appendTo: "#feedback-form-window"
-	}).data("kendoNotification");
-
-	var setCookieByName = function (name, value) {
-		var cookieUUID = getCookieByName("uuid");
-		if(!cookieUUID){
-			document.cookie = "uuid=" + generateUUID() +"; path=/";
-		}
-		//This is a very crude, but necessary because currently there is somekind of url rewriting going on
-		//so the cookies are set for a base path but then additional navigation is done with url rewriting
-		//so we set the cookie name as complete path to avoid a problem where the cookie is set for multiple pages.
-		if(name === "yesNoFeedback"){
-			name = currentPath;
-		}
-		document.cookie = name + "=" + value +";";
-	};
-
-	//Feedback menu controls
-	var feedbackButtonsContainer = $("#helpful-buttons-container");
-	var feedbackSubmittedContainer = $("#feedback-submitted-container");
-	var toggleFeedbackButtons = function (toggle) {
-		if (toggle) {
-			feedbackButtonsContainer.show();
-			feedbackSubmittedContainer.hide();
-		} else {
-			feedbackButtonsContainer.hide();
-			feedbackSubmittedContainer.show();
-		}
-	};
-
-	var checkIfYesNoSubmitted = function () {
-		//If cookie for feedback is set hide the buttons
+	
+		var formIsProcessing = false;
+		//Util functions
+		var generateUUID = function () {
+			return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
+				var r = Math.random() * 16 | 0, v = c == 'x' ? r : (r & 0x3 | 0x8);
+				return v.toString(16);
+			});
+		};
+	
+		var getCookieByName = function (name) {
+			//This is very crude, but necessary because currently there is some kind of url rewriting going on
+			//so the cookies are set for a base path but then additional navigation is done with url rewriting
+			//so we set the cookie name as complete path to avoid a problem where the cookie is set for multiple pages.
+			if (name === "yesNoFeedback") {
+				name = currentPath;
+			}
+			var match = document.cookie.match(new RegExp(name + '=([^;]+)'));
+			if (match) return match[1];
+		};
+	
+		//Init utility variables
+		var rawLocationObject = $(location);
+		var currentPath = rawLocationObject[0].origin + rawLocationObject[0].pathname;
+		var popupNotification = $("#popupNotification").kendoNotification().data("kendoNotification");
+		var formPopupNotification = $("#feedback-form-popup-container").kendoNotification({
+			appendTo: "#feedback-form-window"
+		}).data("kendoNotification");
+	
+		var setCookieByName = function (name, value) {
+			var cookieUUID = getCookieByName("uuid");
+			if (!cookieUUID) {
+				document.cookie = "uuid=" + generateUUID() + "; path=/";
+			}
+			//This is very crude, but necessary because currently there is some kind of url rewriting going on
+			//so the cookies are set for a base path but then additional navigation is done with url rewriting
+			//so we set the cookie name as complete path to avoid a problem where the cookie is set for multiple pages.
+			if (name === "yesNoFeedback") {
+				name = currentPath;
+			}
+			document.cookie = name + "=" + value + ";";
+		};
+	
+		//Feedback menu controls
+		var feedbackButtonsContainer = $("#helpful-buttons-container");
+		var feedbackSubmittedContainer = $("#feedback-submitted-container");
+		var toggleFeedbackButtons = function (toggle) {
+			if (toggle) {
+				feedbackButtonsContainer.show();
+				feedbackSubmittedContainer.hide();
+			} else {
+				feedbackButtonsContainer.hide();
+				feedbackSubmittedContainer.show();
+			}
+		};
+	
 		if (getCookieByName("yesNoFeedback")) {
 			toggleFeedbackButtons(false);
-		}else{
+		} else {
 			toggleFeedbackButtons(true);
 		}
-		return false;
-	};
-
-
-	//FORM
-	//Init the form popup window
-	var win = $("#feedback-form-window").kendoWindow({
-		actions: ["Close"],
-		draggable: false,
-		height: "700px",
-		modal: true,
-		pinned: false,
-		visible: false,
-		title: false,
-		resizable: false,
-		width: "500px"
-	}).data("kendoWindow");
-	//Init form
-	var feedbackForm = $("#feedback-form");
-	var formModel = kendo.observable(defaultFormValues);
-	var isFormModelEmpty = function (){
-		var isModelDefault = true;
-		for (var key in defaultFormValues) {
-			var isValueEqual = formModel[key] === defaultFormValues[key];
-			if(!isValueEqual){
-				isModelDefault = false;
-				break;
-			}
-		}
-		return isModelDefault;
-	};
-	//Bind model to form
-	kendo.bind($("div#feedback-form-window"), formModel);
-	//Attach to form submit to adjust variables and send request
-	var validator = feedbackForm.kendoValidator({
-		messages: {
-			// defines a message for the custom validation rule
-			htmlValidation: "HTML tags are not allowed in the input.",
-			messageLength: "Message must be below 2500 symbols.",
-			whiteSpaces: "Whitespaces only text is not allowed."
-		},
-		rules: {
-			htmlValidation: function(input) {
-				if (input.is("[id=feedback-text-input]")) {
-					var string = input.val();
-					var matches = string.match(/(<([^>]+)>)/ig);
-					if(matches != null){
-						return false;
-					}
+	
+		//FORM
+		//Init the form popup window
+		var win = $("#feedback-form-window").kendoWindow({
+			actions: ["Close"],
+			draggable: true,
+			modal: true,
+			pinned: false,
+			visible: false,
+			title: false,
+			resizable: false,
+			width: "500px"
+		}).data("kendoWindow");
+		//Init form
+		var feedbackForm = $("#feedback-form");
+		var formModel = kendo.observable(defaultFormValues);
+		var isFormModelEmpty = function () {
+			var isModelDefault = true;
+			for (var key in defaultFormValues) {
+				if (key === 'email') {
+					continue;
 				}
+				var isValueEqual = formModel[key] === defaultFormValues[key];
+				if (!isValueEqual) {
+					isModelDefault = false;
+					break;
+				}
+			}
+			return isModelDefault;
+		};
+	
+		var isFormModelSatisfied = function (key, formValue) {
+			var value = formModel[key];
+			if (value) {
+				return formValue && formValue.length > 0;
+			} else {
 				return true;
+			}
+		}
+		//Bind model to form
+		kendo.bind($("div#feedback-form-window"), formModel);
+		//Attach to form submit to adjust variables and send request
+		var emptyFormValidator = $("#feedback-checkbox-area").kendoValidator({
+			validateOnBlur: false,
+			messages: {
+				// defines a message for the custom validation rule
+				emptyForm: "You need to provide some feedback before submitting the form."
 			},
-			messageLength: function(input) {
-				if (input.is("[id=feedback-text-input]")) {
-					var string = input.val();
-					if(string.length > 2500){
-						return false;
-					}
+			rules: {
+				emptyForm: function (input) {
+					return !isFormModelEmpty();
 				}
-				return true;
+			}
+	
+		}).data("kendoValidator");
+	
+		var emailValidator = $("#feedback-email-input").kendoValidator({
+			validateOnBlur: false,
+			messages: {
+				email: "Invalid email address."
 			},
-			whiteSpaces: function(input) {
-				if (input.is("[id=feedback-text-input]")) {
-					return $.trim(input.val()) !== "";
+			rules: {
+				email: function (input) {
+					if (input.val().length > 0) {
+						var re = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+						return re.test(input.val());
+					}
+					return true;
 				}
-				return true;
 			}
-		}}).data("kendoValidator")
-	feedbackForm.submit(function(e) {
-		e.preventDefault();
-		//if form is processing do nothing.
-		if(formIsProcessing){
-			return;
-		}
-		formIsProcessing = true;
-		if(isFormModelEmpty()){
-			formPopupNotification.show("Please provide some feedback before submitting the form.", "Error");
-			formIsProcessing = false;
-			return;
+		}).data("kendoValidator");
+	
+		// text validation is disabled for the new design of the form. In order to enable it
+		// it must be reworked!!!
+		var textAreaValidator = function (selector, formModelKey) {
+			return $(selector).kendoValidator({
+				validateOnBlur: false,
+				messages: {
+					emptyValidation: "Please provide some additional information.",
+					htmlValidation: "HTML tags are not allowed in this field.",
+					messageLength: "The message length must not exceed 2500 characters.",
+					whiteSpaces: "Using only white spaces is not allowed in this field.",
+					feedbackValidation: "Please select a category and provide some additional information."
+				},
+				rules: {
+					emptyValidation: function (input) {
+						var text = input.val();
+						return isFormModelSatisfied(formModelKey, text);
+					},
+					htmlValidation: function (input) {
+						var text = input.val();
+						var matches = text.match(/(<([^>]+)>)/ig);
+						if (matches != null) {
+							return false;
+						}
+						return true;
+					},
+					messageLength: function (input) {
+						var text = input.val();
+						if (text.length > 2500) {
+							return false;
+						}
+						return true;
+					},
+					whiteSpaces: function (input) {
+						var text = input.val();
+						if (text.length > 0) {
+							return $.trim(text) !== "";
+						}
+						return true;
+					},
+					feedbackValidation: function (input) {
+						var text = input.val();
+						if (text.length > 0) {
+							return formModel[formModelKey];
+						}
+						return true;
+					}
+				}
+			}).data("kendoValidator");
 		}
-		if(validator.validate()) {
-			win.close();
-			setCookieByName("submittingFeedback")
-			formModel.yesNoFeedback = getCookieByName("yesNoFeedback") || "Not submitted";
-			formModel.uuid = getCookieByName("uuid");
-			formModel.path = currentPath;
-			formModel.sheetId = $("#hidden-sheet-id").val();
-			$.post("http://api.everlive.com/v1/lzrla9wpuk636rdd/functions/saveFeedback", formModel.toJSON(), function () {
+	
+		feedbackForm.submit(function (e) {
+			e.preventDefault();
+			//if form is processing do nothing.
+			if (formIsProcessing) {
+				return;
+			}
+			formIsProcessing = true;
+			//if(isFormModelEmpty()){
+			//	formPopupNotification.show("Please provide some feedback before submitting the form.", "Error");
+			//	formIsProcessing = false;
+			//	return;
+			//}
+	
+			if (textAreaValidator("#feedback-code-sample-text-input", "outdatedSample").validate() &&
+				textAreaValidator("#feedback-more-information-text-input", "otherMoreInformation").validate() &&
+				textAreaValidator("#feedback-text-errors-text-input", "textErrors").validate() &&
+				textAreaValidator("#feedback-inaccurate-content-text-input", "inaccurateContent").validate() &&
+				textAreaValidator("#feedback-other-text-input", "otherFeedback").validate() &&
+				emptyFormValidator.validate() &&
+				emailValidator.validate()) {
+				win.close();
+				setCookieByName("submittingFeedback")
+				formModel.yesNoFeedback = getCookieByName("yesNoFeedback") || "Not submitted";
+				formModel.uuid = getCookieByName("uuid");
+				formModel.path = currentPath;
+				formModel.sheetId = $("#hidden-sheet-id").val();
+				$.post("https://api.everlive.com/v1/lzrla9wpuk636rdd/functions/saveFeedback", formModel.toJSON(), function () {
+					formIsProcessing = false;
+				});
+			} else {
 				formIsProcessing = false;
-				popupNotification.show("Your feedback was saved. Thank you!", "info");
-			});
-		}else {
-			formIsProcessing = false;
+			}
+		});
+	
+		//Attach to close button inside form window
+		$("#form-close-button").click(function () {
+			win.close();
+		});
+	
+		//Attach to submit button inside form window
+		$("#form-submit-button").click(function () {
+			feedbackForm.submit();
+		});
+	
+		//Init buttons
+		$("#yesButton").click(function () {
+			setCookieByName("yesNoFeedback", "Yes");
+			toggleFeedbackButtons(false);
+			Feedback.closeFeedback();
+			Feedback.adjustNavigationPosition();
+		});
+		$("#noButton").click(function () {
+			setCookieByName("yesNoFeedback", "No");
+			toggleFeedbackButtons(false);
+			Feedback.closeFeedback();
+			Feedback.adjustNavigationPosition();
+			win.center().open();
+		});
+		$("#additional-feedback-button").click(function () {
+			win.center().open();
+		});
+	
+	
+		var windowHeight = $window.height();
+		var headerHeight = $(".TK-Hat").outerHeight() + $("#page-header").outerHeight();
+		var footerHeight = $("#feedback-section").outerHeight() + $("footer").outerHeight();
+		var articleHeight = windowHeight - (headerHeight + footerHeight);
+		var feedbackOffsetTop = document.body.scrollHeight - footerHeight;
+		var shouldOverlayFeedback = !getCookieByName("yesNoFeedback") && !getCookieByName("yesNoFeedbackClosed");
+		var showingFeedbackBar = false;
+		var scrollFold = $window.scrollTop() + windowHeight;
+		var feedbackPinned = false;
+	
+		function updateVariables() {
+			windowHeight = $window.height();
+			headerHeight = $(".TK-Hat").outerHeight() + $("#page-header").outerHeight();
+			footerHeight = $("#feedback-section").outerHeight() + $("footer").outerHeight();
+			articleHeight = windowHeight - (headerHeight + footerHeight);
+			feedbackOffsetTop = document.body.scrollHeight - footerHeight;
+			scrollFold = $window.scrollTop() + windowHeight;
 		}
-	});
-
-	//Attach to close button inside form window
-	$("#form-close-button").click(function () {
-		win.close();
-	});
-
-	//Init buttons
-	$("#yesButton").click(function () {
-		setCookieByName("yesNoFeedback", "Yes");
-		toggleFeedbackButtons(false);
-		popupNotification.show("Thank you for your feedback!", "info");
-	});
-	$("#noButton").click(function () {
-		setCookieByName("yesNoFeedback", "No");
-		toggleFeedbackButtons(false);
-		win.center().open();
-	});
-	$("#additional-feedback-button").click(function () {
-		win.center().open();
-	});
-
-	//Check for the cookie aka state of buttons
-	checkIfYesNoSubmitted();
-});
\ No newline at end of file
+	
+		Feedback = $.extend(Feedback, {
+	
+			init: function() {
+	
+				Feedback._events();
+	
+				Feedback.adjustArticleHeight();
+				Feedback.adjustNavigationPosition();
+	
+				if (shouldOverlayFeedback) {
+	
+					showingFeedbackBar = true;
+	
+					window.setTimeout(function() {
+						showingFeedbackBar = false;
+						Feedback.adjustFeedbackPoistion();
+						Feedback.adjustNavigationPosition();
+					}, 10000);
+				}
+	
+			},
+	
+	
+			// #region events
+			_events: function() {
+				$window.scroll(Feedback._window_scroll);
+				$window.resize(Feedback._window_resize);
+				$("#close-button").click(Feedback._button_click);
+			},
+			_window_scroll: function() {
+				updateVariables();
+	
+				scrollFold = $window.scrollTop() + windowHeight;
+	
+				Feedback.adjustFeedbackPoistion();
+				Feedback.adjustNavigationPosition();
+			},
+			_window_resize: function() {
+				updateVariables();
+	
+				Feedback.adjustArticleHeight();
+				Feedback.adjustFeedbackPoistion();
+				Feedback.adjustNavigationPosition();
+			},
+			_button_click: function() {
+				Feedback.closeFeedback();
+				Feedback.adjustNavigationPosition();
+			},
+			// #endregion
+	
+	
+			// #region adjusters
+			adjustNavigationPosition: function Feedback_adjustNavigationPosition() {
+				var bottom = 0;
+	
+				if (!window.matchMedia('(max-width: 1200px)').matches) {
+					bottom = Math.max(feedbackPinned ? $("#feedback-section").outerHeight() : 0, scrollFold - feedbackOffsetTop );
+				}
+	
+				$("#page-nav").css("bottom", bottom);
+			},
+			adjustArticleHeight: function Feedback_adjustArticleHeight() {
+				$("#page-article").css("min-height", articleHeight);
+			},
+			adjustFeedbackPoistion: function Feedback_adjustFeedbackPosition() {
+				if (!shouldOverlayFeedback || showingFeedbackBar) {
+					return;
+				}
+	
+				if (scrollFold - $("#feedback-section").outerHeight() < feedbackOffsetTop) {
+					Feedback.pinFeedback();
+				}
+				else {
+					Feedback.unpinFeedback();
+				}
+			},
+			// #endregion
+	
+	
+			// #region feedback bar
+			pinFeedback: function Feedback_pinFeedback() {
+				feedbackPinned = true;
+				$("#feedback-section").addClass("fixed");
+				$("#feedback-section-dummy").show();
+			},
+			unpinFeedback: function Feedback_pinFeedback() {
+				feedbackPinned = false;
+				$("#feedback-section").removeClass("fixed");
+				$("#feedback-section-dummy").hide();
+			},
+			closeFeedback: function Feedback_pinFeedback() {
+				shouldOverlayFeedback = false;
+				setCookieByName("yesNoFeedbackClosed");
+				Feedback.unpinFeedback();
+			}
+			// #endregion
+	
+		});
+	
+		Feedback.init();
+	
+	});
\ No newline at end of file
diff --git a/build/_assets/stylesheets/styles.css b/build/_assets/stylesheets/styles.css
index cd2104b12..433f9ac05 100644
--- a/build/_assets/stylesheets/styles.css
+++ b/build/_assets/stylesheets/styles.css
@@ -5410,12 +5410,28 @@ input.gsc-search-button:focus {
     overflow: visible;
   }
 }
-
 div.noimprovethis {
   display: none;
 }
+#feedback-checkbox-area {
+  margin-top: 24px;
+}
 #feedback-form-window{
-  background-color: #fff
+  background-color: #fff;
+  padding: 27px 30px 10px 30px;
+  overflow: hidden;
+}
+#feedback-checkbox-area label{
+  display: block;
+  margin: 5px 0 10px;
+}
+#feedback-checkbox-area textarea{
+  width: 90%;
+}
+.feedback-extw__input {
+  margin: 12px 0 30px;
+  padding: 10px;
+  width: 90%;
 }
 #send-feedback {
 	float: left;
diff --git a/build/_includes/feedback-form.html b/build/_includes/feedback-form.html
index 8b52f92f6..397697612 100644
--- a/build/_includes/feedback-form.html
+++ b/build/_includes/feedback-form.html
@@ -1,87 +1,73 @@
 <div id="feedback-section">
-    <script src="https://bs-static.cdn.telerik.com/documentation/feedback/latest/feedback.js"></script>
-  
-    <span id="popupNotification"></span>
-  
-    <div id="feedback-menu-container" class="feedback-ext">
-      <div id="helpful-buttons-container" class="feedback-ext__left">
-        <span class="feedback-ext__label-normal">Was this article helpful?</span>
-  
-        <button id="noButton" class="feedback-ext__button button button--small">No</button>
-        <button id="yesButton" class="feedback-ext__button button button--small">Yes</button>
-      </div>
-  
-      <div id="feedback-submitted-container" class="feedback-ext__left">
-        <span class="feedback-ext__label-submit">Thank you for your feedback!</span>
-      </div>
-  
-      <div id="additional-feedback-button" class="feedback-ext__right">
-        <span class="feedback-ext__addition">Give additional feedback</span>
-      </div>
+  {% javascript feedback-form %}
+  <span id="popupNotification"></span>
+  <div id="feedback-menu-container">
+    <div class="-fr col-5" id="helpful-buttons-container">
+      <span class="side-title">Is this article helpful?</span>
+      <a class="Btn" id="yesButton">Yes</a> /
+      <a class="Btn" id="noButton">No</a>
+    </div>
+    <div class="-fr col-5" id="feedback-submitted-container">
+      <span class="side-title">Thank you for your feedback!</span>
     </div>
-  
-    <div id="feedback-window-container">
-      <div id="feedback-form-window" class="feedback-extw">
-        <h1 class="feedback-extw__title">Give article feedback</h1>
-  
-        <p class="feedback-extw__subtitle">Tell us how we can improve the information</p>
-  
-        <span id="feedback-form-popup-container"></span>
-  
-        <form id="feedback-form" class="feedback-extw__form">
-            <div id ="feedback-checkbox-area">
-              <input id="hidden-sheet-id" type="hidden" value="{{site.ff-sheet-id}}">
-              <label class="feedback-extw__checkbox checkbox">
-                <input type="checkbox" value="outdated-sample" class="checkbox__input"
-                  data-bind="checked: outdatedSample">
-  
-                <div class="checkbox__icon"></div>
-                <span class="checkbox__text">Code samples are inaccurate/outdated.</span>
-              </label>
-  
-              <label class="feedback-extw__checkbox checkbox">
-                <input type="checkbox" value="wrong-information" class="checkbox__input"
-                  data-bind="checked: wrongInformation">
-  
-                <div class="checkbox__icon"></div>
-                <span class="checkbox__text">I expected to find other information.</span>
-              </label>
-  
-              <label class="feedback-extw__checkbox checkbox">
-                <input type="checkbox" value="insufficient-information" class="checkbox__input"
-                  data-bind="checked: insufficientInformation">
-  
-                <div class="checkbox__icon"></div>
-                <span class="checkbox__text">I expected to find more information.</span>
-              </label>
-  
-              <label class="feedback-extw__checkbox checkbox">
-                <input type="checkbox" value="text-errors" class="checkbox__input"
-                  data-bind="checked: textErrors">
-  
-                <div class="checkbox__icon"></div>
-                <span class="checkbox__text">There are typos / broken links / broken page elements.</span>
-              </label>
-  
-              <label class="feedback-extw__checkbox checkbox">
-                <input type="checkbox" value="inaccurate-content" class="checkbox__input"
-                  data-bind="checked: inaccurateContent">
-  
-                <div class="checkbox__icon"></div>
-                <span class="checkbox__text">Content is inaccurate / outdated.</span>
-              </label>
-            </div>
-              <textarea id="feedback-text-input" class="feedback-extw__textarea textarea"
-                placeholder="Enter details or unlisted feedback (optional)"
-                data-bind="value: textFeedback">
-              </textarea>
-          <input id="feedback-email-input" class="feedback-extw__input input" placeholder="email (optional)" data-bind="value: email">
-        </form>
-  
-        <div class="feedback-extw__foot">
-          <button id="form-submit-button" class="feedback-extw__button button button--action">Send feedback</button>
-          <button id="form-close-button" class="feedback-extw__button button">Cancel</button>
+  </div>
+  <div id="feedback-window-container">
+    <div id="feedback-form-window" class="-p2" style="background-color: white;">
+      <h1 class="h3 feedback-extw__title">Give article feedback</h1>
+      <p class="h5">Tell us how we can improve this article</p>
+      <span id="feedback-form-popup-container"></span>
+      <form id="feedback-form">
+        <div id="feedback-checkbox-area">
+          <input id="hidden-sheet-id" type="hidden" value="{{site.ff-sheet-id}}">
+          <label>
+            <input type="checkbox" data-bind="checked: outdatedSample"/>
+            Code samples are inaccurate / outdated.
+          </label>
+          <span class="required-field" data-bind="visible: outdatedSample"></span>
+          <textarea id="feedback-code-sample-text-input" placeholder="Please, specify more details ..." class="feedback-extw__textarea"
+            data-bind="visible: outdatedSample, value: inaccurateOutdatedCodeSamplesText">
+          </textarea>
+          <label>
+            <input type="checkbox" data-bind="checked: otherMoreInformation"/>
+            I expected to find other / more information. 
+          </label>
+          <span class="required-field" data-bind="visible: otherMoreInformation"></span>
+          <textarea id="feedback-more-information-text-input" class="feedback-extw__textarea" placeholder="Please, specify what information can be added ..."
+            data-bind="visible: otherMoreInformation, value: otherMoreInformationText" >
+          </textarea>
+          <label>
+            <input type="checkbox" data-bind="checked: textErrors"/>
+            There are typos / broken links / broken page elements.
+          </label>
+          <span class="required-field" data-bind="visible: textErrors"></span>
+          <textarea id="feedback-text-errors-text-input" class="feedback-extw__textarea" placeholder="Please, specify what needs to be fixed ..."
+            data-bind="visible: textErrors, value: typosLinksElementsText">
+          </textarea>
+          <label>
+            <input type="checkbox" data-bind="checked: inaccurateContent"/>
+            Content is inaccurate / outdated.
+          </label>
+          <span class="required-field" data-bind="visible: inaccurateContent"></span>
+          <textarea id="feedback-inaccurate-content-text-input" class="feedback-extw__textarea" placeholder="Please, specify which conent ..."
+            data-bind="visible: inaccurateContent, value: inaccurateOutdatedContentText"></textarea>
+          <label>
+            <input type="checkbox" data-bind="checked: otherFeedback"/>
+            Other
+          </label>
+          <span class="required-field" data-bind="visible: otherFeedback"></span>
+          <textarea id="feedback-other-text-input" placeholder="Please, enter more details or not listed feedback ..." class="feedback-extw__textarea"
+            data-bind="visible: otherFeedback, value: textFeedback">
+          </textarea>
+          <input id="feedback-email-input" type="email" placeholder="email (optional)" data-email-msg="Email format is not valid." class="feedback-extw__input input"
+            data-bind="value: email"/>
         </div>
+      </form>
+      <div class="feedback-extw__foot">
+        <button id="form-submit-button" class="Btn col-5 feedback-extw__button button button--action">Send feedback</button>
+        <button id="form-close-button" class="Btn Btn--ghost col-5 feedback-extw__button button">Cancel</button>
       </div>
     </div>
-  </div>
\ No newline at end of file
+  </div>
+  <!-- <a id="close-button" class="button"><img src="{{site.baseurl}}/images/close-btn.svg" alt="close" /></a> -->
+</div>
+<!-- <div id="feedback-section-dummy">Dummy</div> -->
\ No newline at end of file
diff --git a/build/_includes/improvethis.html b/build/_includes/improvethis.html
index 94dea972e..39262d9be 100644
--- a/build/_includes/improvethis.html
+++ b/build/_includes/improvethis.html
@@ -1,4 +1,4 @@
 <div class="{{ page.improvethisvisibilityclass }}">
+  <a href="{{ page.improvethisurl }}" class="-fr Btn Btn--ghost col-4 -mb3"  target="_blank">Improve this article</a>
   <hr class="-mt7 -mb4" />
-  <a href="{{ page.improvethisurl }}" class="Btn Btn--ghost col-4" target="_blank">Improve this article</a>
 </div>
diff --git a/build/_layouts/page.html b/build/_layouts/page.html
index ebcd63dc7..3cb56d675 100644
--- a/build/_layouts/page.html
+++ b/build/_layouts/page.html
@@ -29,14 +29,13 @@
             });
             </script>
         </div>
-
+        
         <div id="page-article" class="col-9 -xl-col-8 -l-col-8 -m-col-12">
-
+            {% include improvethis.html %}
             <article>
                 {{ content }}
             </article>
 
-            {% include improvethis.html %}
             {% if site.ff-sheet-id %}{% include feedback-form.html %}{% endif %}
         </div>
     </div>