diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
new file mode 100644
index 0000000..ab97011
--- /dev/null
+++ b/.github/pull_request_template.md
@@ -0,0 +1,2 @@
+**Related Issue**: Issue #
+**Description**:
diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 0000000..09827eb
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,76 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, sex characteristics, gender identity and expression,
+level of experience, education, socio-economic status, nationality, personal
+appearance, race, religion, or sexual identity and orientation.
+
+## Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+ advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+ address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+ professional setting
+
+## Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+## Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at . All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see
+https://www.contributor-covenant.org/faq
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..6b72650
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,9 @@
+# How to contribute
+## Giving feedback
+If you have any questions or feedback, you can drop a in [the official genius forum](https://genius.com/discussions/381840-Google-chrome-extension-for-new-features).
+
+## Development
+If you want to contribute to this project, fork it, make your changes and create a pull request.
+
+## Repository
+If you create issues or pull requests. Please use the templates you will be offered. If there's not a proper template or you have any questions, please don't hesitate to ask me.
diff --git a/README.md b/README.md
index 94b94da..ba822c6 100644
--- a/README.md
+++ b/README.md
@@ -9,11 +9,7 @@ Community-based development has its benefits and downsides, but instead of putti
 geniusly is currently in beta. So feel free to install it as described below and give some feedback.
 
 # Contributing
-## Giving feedback
-If you have any questions or feedback, you can drop a in [the official genius forum](https://genius.com/discussions/381840-Google-chrome-extension-for-new-features).
-
-## Development
-If you want to contribute to this project, fork it, make your changes and create a pull request.
+See [Contribution guide](CONTRIBUTING.md)
 
 # Installation
 1. Go to the [releases list](https://github.com/shaedrich/geniusly/releases) and download the most recent .zip
diff --git a/artist.js b/artist.js
index 64d7668..d361696 100644
--- a/artist.js
+++ b/artist.js
@@ -10,7 +10,7 @@ var templates = {
 				<div class="mini_card-title_and_subtitle">
 					<div class="mini_card-title">{{song.title}}</div>
 					<div class="mini_card-subtitle">
-					{{song.primary_artist.name}}<!---->
+						{{song.primary_artist.name}}<!---->
 					</div>
 				</div>
 				<!---->
@@ -204,7 +204,7 @@ var filterOptions = {
 	"answer": chrome.i18n.getMessage('answer'),
 	"missing_albums": chrome.i18n.getMessage('missing_albums'),
 	"missing_release_date": chrome.i18n.getMessage('missing_release_date'),
-}
+};
 var activeFilter = 'all';
 var content = null;
 var setActiveFilter = function(e) {
@@ -220,7 +220,7 @@ function renderFilterBar(content) {
 	filterBar.classList.add('zuri-filterbar');
 	Object.assign(filterBar.style, {
 		marginTop: '20px',
-	})
+	});
 	for (var filter in filterOptions) {
 		var filterEl = document.createElement('li');
 		var filterText = document.createTextNode(filterOptions[filter]);
@@ -307,7 +307,7 @@ var setTabName = function(e) {
 	} else if (tabName === 'description') {
 		descriptionUI();
 	}
-}
+};
 
 function loadMoreSongs(artist) {
 	return new Promise(function(resolve, reject) {