diff --git a/Makefile b/Makefile
index 3485be1d..928a90d8 100644
--- a/Makefile
+++ b/Makefile
@@ -37,3 +37,12 @@ test:
 
 clear_cache:
 	python manage.py clear_cache
+
+docker-build:
+	docker build -t swapi .
+
+docker-run:
+	docker run -p8000:8000  --name swapi-local-container --rm swapi
+
+docker-kill:
+	docker kill swapi-local-container
diff --git a/README.md b/README.md
index e5cec846..b2cf502e 100644
--- a/README.md
+++ b/README.md
@@ -12,5 +12,20 @@ An "unofficial" branch of "swapi", supported by @juriy
 
 
 ## Will it be updated?
-Original swapi project is built on Python/Django stack that is quite outdated by now. It would be a great exercise to rewrite it in cloud-native manner, but this requires time and effort. I'm looking into doing that. There's no timelines yet, since "swapi" stopped its existence quite suddenly. Suggestions and help are always welcome!
 
+Original swapi project is built on Python/Django stack that is quite outdated by now.
+It would be a great exercise to rewrite it in cloud-native manner, but this requires time and effort. I'm looking into doing that. There's no timelines yet, since "swapi" stopped its existence quite suddenly. Suggestions and help are always welcome!
+
+## How to run it?
+The easiest way to run swapi – via docker
+
+```
+# Ruilding the image
+make docker-build
+
+# Running the container
+make docker-run
+
+# Kill the running container
+make docker-kill
+```
diff --git a/swapi/templates/base.html b/swapi/templates/base.html
index 458e541f..d43b0373 100644
--- a/swapi/templates/base.html
+++ b/swapi/templates/base.html
@@ -11,6 +11,8 @@
     <link href="/static/css/bootstrap.css" rel="stylesheet">
     <link href="/static/css/custom.css" rel="stylesheet">
     <link rel="shortcut icon" href="/static/favicon.ico">
+    <!-- highlight.js -->
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/default.min.css"> 
     </style>
     <script src="//code.jquery.com/jquery-2.1.0.min.js"></script>
     <script src="//maxcdn.bootstrapcdn.com/bootstrap/3.3.0/js/bootstrap.min.js"></script>
@@ -22,6 +24,9 @@
       gtag('js', new Date());
       gtag('config', 'UA-163610532-1');
     </script>
+    <!-- Highlight.js -->
+    <script src="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/highlight.min.js"></script> 
+    <script>hljs.highlightAll();</script>
   </head>
   <body>
     <nav class="navbar navbar-default" role="navigation">
@@ -33,7 +38,7 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
-      <div class="navbar-brand" href="#"><a href="https://twitter.com/share" class="twitter-share-button" data-url="https://swapi.co" data-text="swapi.dev - the Star Wars API " data-via="juriy" data-related="juriy">Tweet</a>
+      <div class="navbar-brand" href="#"><a href="https://twitter.com/share" class="twitter-share-button" data-url="https://swapi.dev" data-text="swapi.dev - the Star Wars API " data-via="juriy" data-related="juriy">Tweet</a>
             <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></div>
     </div>
     <div class="collapse navbar-collapse">
diff --git a/swapi/templates/index.html b/swapi/templates/index.html
index 4cb5e9e6..ec180c8a 100644
--- a/swapi/templates/index.html
+++ b/swapi/templates/index.html
@@ -28,9 +28,9 @@ <h1 class="center">
               <span class="input-group-btn"><button onClick="interactive_call();return false;" class="btn btn-primary">request</button></span>
             </div>
         <small>Need a hint? try <a href="#" onClick="update('people/1/');return false;"><i>people/1/</i></a> or <a href="#" onClick="update('planets/3/');return false;"><i>planets/3/</i></a> or <a href="#" onClick="update('starships/9/');return false;"><i>starships/9/</i></a></small>
-        <p class="lead pad_top">Result:</p>
+        <p class="lead pad_top">Results:</p>
         <div class="well">
-          <pre id="interactive_output" class="pre-scrollable">
+          <pre id="interactive_output" class="pre-scrollable"><code class="language-json">
 {
 	"name": "Luke Skywalker",
 	"height": "172",
@@ -63,7 +63,7 @@ <h1 class="center">
 	"edited": "2014-12-20T21:17:56.891000Z",
 	"url": "https://swapi.dev/api/people/1/"
 }
-          </pre>
+        </code></pre>
         </div>
     </div>
     <div class="col-sm-2 col-lg-2 col-md-2">
diff --git a/swapi/templates/rest_framework/api.html b/swapi/templates/rest_framework/api.html
index 51da42b4..af39cb13 100644
--- a/swapi/templates/rest_framework/api.html
+++ b/swapi/templates/rest_framework/api.html
@@ -12,7 +12,7 @@
 <span class="icon-bar"></span>
 <span class="icon-bar"></span>
 </button>
-<div class="navbar-brand" href="#"><a href="https://twitter.com/share" class="twitter-share-button" data-url="https://swapi.co" data-text="SWAPI - the Star Wars API " data-via="juriy" data-related="juriy">Tweet</a>
+<div class="navbar-brand" href="#"><a href="https://twitter.com/share" class="twitter-share-button" data-url="https://swapi.dev" data-text="SWAPI - the Star Wars API " data-via="juriy" data-related="juriy">Tweet</a>
     <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0],p=/^http:/.test(d.location)?'http':'https';if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src=p+'://platform.twitter.com/widgets.js';fjs.parentNode.insertBefore(js,fjs);}}(document, 'script', 'twitter-wjs');</script></div>
 </div>
 <div class="collapse navbar-collapse">
