diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 20d770afb..6b61a5844 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,4 +1,4 @@
-Welcome, dear friend! We, the rest of the NativeScript community really
+Welcome dear friend! We, the rest of the NativeScript community really
 appreciate your feedback! While we are doing all we can to take care of every
 issue, sometimes we get overwhelmed. Because of that, we will consider issues
 that are not constructive or report problems that cannot be reproduced "dead".
@@ -8,7 +8,9 @@ questions regarding the behavior/reproduction for more than 20 days "dead". All
 
 ## Please, help the others with the details below:
 
-### Did you verify this is a real problem with a search in [StackOverflow](http://stackoverflow.com/questions/tagged/nativescript)?
+### Did you verify this is a real problem with a search in
+[StackOverflow](http://stackoverflow.com/questions/tagged/nativescript)
+and the other issues here?
 
 ### Tell us about the problem
 Please, ensure your title is less than 50 characters and starts with a capital
@@ -16,7 +18,14 @@ letter. We strive to follow the guidelines in the
 [How to Write a Git Commit Message] (http://chris.beams.io/posts/git-commit/)
 article for PR titles.
 
-### Which version of NativeScript did you use (check the 'version' atrribute in the node_modules/tns-core-modules/package.json file)
+### Which platform does it happen on?
+iOS/Android/Both
+
+### Which versions of the NativeScript elements did you use?
+CLI: (run tns --version to fetch it)
+Cross-platform modules: (check the 'version' attribute in the
+`node_modules/tns-core-modules/package.json` file in your project)
+Runtime: (check the entries in the package.json file of your project)
 
 ### Try to recall what were you doing
 
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2fb3cfe4f..506cd24da 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,7 +2,7 @@ Dear friend, we, the rest of the NativeScript community thank you for your
 contribution! As we want to present a really nice, readable changelog with each
 release, we ask you to fill the following information:
 
-### Inform what relation and with with issue does it have (in other words, delete the unnecessary):
+### Inform what relation and with which issue does it have (in other words, delete the unnecessary):
 Fixes/Implements #[Issue Number].
 
 ### Does it have [unit tests](https://github.com/NativeScript/NativeScript/blob/master/running-tests.md)?