diff --git a/app/Http/Controllers/PostsController.php b/app/Http/Controllers/PostsController.php
index cc7669d..6df90ce 100644
--- a/app/Http/Controllers/PostsController.php
+++ b/app/Http/Controllers/PostsController.php
@@ -6,9 +6,8 @@
 use App\Notifications\PostDeleted;
 use App\Notifications\PostEdited;
 use App\Post;
-use App\Post_tag;
+use App\PostTag;
 use App\Tag;
-use App\User;
 use Illuminate\Http\Request;
 
 class PostsController extends Controller
@@ -19,6 +18,16 @@ public function __construct()
         $this->middleware('can:update,post')->except(['index', 'userPosts', 'adminIndex', 'create', 'store']);
     }
 
+    public function validateRequest(Request $request)
+    {
+        return $request->validate([
+            'code' => 'required|unique:posts|regex:/[a-zA-Z0-9_-]+/',
+            'name' => 'required|min:5|max:100',
+            'description' => 'required|max:255',
+            'text' => 'required'
+        ]);
+    }
+
     public function index()
     {
         $posts = Post::with('tags')->latest()->get();
@@ -43,12 +52,7 @@ public function create()
 
     public function store(Request $request)
     {
-        $attr = $request->validate([
-            'code' => 'required|unique:posts|regex:/[a-zA-Z0-9_-]+/',
-            'name' => 'required|min:5|max:100',
-            'description' => 'required|max:255',
-            'text' => 'required'
-        ]);
+        $attr = $this->validateRequest($request);
 
         if ($request->has('published')) {
             $attr['published'] = 1;
@@ -58,6 +62,14 @@ public function store(Request $request)
 
         $post = Post::create($attr);
 
+        if ($request->has('tags')) {
+            $requestTags = explode(', ', $request['tags']);
+            foreach ($requestTags as $tag) {
+                $tag = Tag::firstOrCreate(['name' => $tag]);
+                $post->tags()->attach($tag);
+            }
+        }
+
         sendMailNotifyToAdmin(new PostCreated($post));
         flash( 'Post created successfully');
 
@@ -76,11 +88,7 @@ public function edit(Post $post)
 
     public function update(Request $request, Post $post)
     {
-        $values = $request->validate([
-            'name' => 'required|min:5|max:100',
-            'description' => 'required|max:255',
-            'text' => 'required'
-        ]);
+        $values = $this->validateRequest($request);
 
         $post->update($values);
 
@@ -105,7 +113,7 @@ public function update(Request $request, Post $post)
         if ($deleteTags->isNotEmpty()) {
             foreach ($deleteTags as $tag) {
                 $post->tags()->detach($tag);
-                $isLastTag = Post_tag::where('tag_id', $tag->id)->first();
+                $isLastTag = PostTag::where('tag_id', $tag->id)->first();
                 if (!$isLastTag) $tag->delete();
             };
         }
diff --git a/app/PostTag.php b/app/PostTag.php
new file mode 100644
index 0000000..840658a
--- /dev/null
+++ b/app/PostTag.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Relations\Pivot;
+
+class PostTag extends Pivot
+{
+    protected $table = 'post_tag';
+}
diff --git a/app/Post_tag.php b/app/Post_tag.php
deleted file mode 100644
index 895f968..0000000
--- a/app/Post_tag.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-namespace App;
-
-use Illuminate\Database\Eloquent\Model;
-
-class Post_tag extends Model
-{
-    protected $table = 'post_tag';
-    protected $guarded = [];
-}
diff --git a/app/User.php b/app/User.php
index b235ec4..0a98446 100644
--- a/app/User.php
+++ b/app/User.php
@@ -37,7 +37,8 @@ class User extends Authenticatable
         'email_verified_at' => 'datetime',
     ];
 
-    public function posts() {
+    public function posts()
+    {
         return $this->hasMany(Post::class, 'owner_id');
     }
 }
diff --git a/database/migrations/2020_08_26_090725_create_posts_table.php b/database/migrations/2020_08_26_090725_create_posts_table.php
index 2abe5e0..c086593 100644
--- a/database/migrations/2020_08_26_090725_create_posts_table.php
+++ b/database/migrations/2020_08_26_090725_create_posts_table.php
@@ -20,7 +20,7 @@ public function up()
             $table->string('name', 100);
             $table->string('description', 255);
             $table->text('text');
-            $table->boolean('published')->default(0);
+            $table->boolean('published')->default(false);
             $table->timestamp('created_at')->default(DB::raw('CURRENT_TIMESTAMP'));
             $table->timestamp('updated_at')->default(DB::raw('CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP'));
 
diff --git a/resources/views/posts/create.blade.php b/resources/views/posts/create.blade.php
index 95ef852..d5d3634 100644
--- a/resources/views/posts/create.blade.php
+++ b/resources/views/posts/create.blade.php
@@ -99,6 +99,17 @@ class="form-control @error('text') is-invalid @enderror"
                             @enderror
                         </div>
 
+                        <div class="form__field col-6 mb-3">
+                            <label for="form-tags">Tags</label>
+                            <input type="text"
+                                   class="form-control"
+                                   id="form-tags"
+                                   name="tags"
+                                   placeholder="tag1, tag2"
+                                   value="{{ old('tags') }}"
+                            >
+                        </div>
+
                         <div class="form__field form-check mb-2">
                             <input class="form__checkbox"
                                    id="form-checkbox"
diff --git a/resources/views/posts/edit.blade.php b/resources/views/posts/edit.blade.php
index 56e488f..9f125c2 100644
--- a/resources/views/posts/edit.blade.php
+++ b/resources/views/posts/edit.blade.php
@@ -15,6 +15,28 @@
                     @method('patch')
 
                     <div class="form__fields row d-flex flex-column">
+                        <div class="form__field col-6 mb-3">
+                            <label for="form-code">Code</label>
+                            <input type="text"
+                                   class="form-control @error('code') is-invalid @enderror"
+                                   id="form-code"
+                                   name="code"
+                                   value="{{ old('code', $post->code) }}"
+                                   placeholder=""
+                                   required=""
+                            >
+
+                            <div class="invalid-feedback">
+                                Code is required.
+                            </div>
+
+                            @error('code')
+                            <div class="alert alert-danger">
+                                {{ $message }}
+                            </div>
+                            @enderror
+                        </div>
+
                         <div class="form__field col-6 mb-3">
                             <label for="form-name">Post Name</label>
                             <input type="text"
@@ -81,22 +103,11 @@ class="form-control @error('text') is-invalid @enderror"
                         <div class="form__field col-6 mb-3">
                             <label for="form-tags">Tags</label>
                             <input type="text"
-                                   class="form-control @error('description') is-invalid @enderror"
+                                   class="form-control"
                                    id="form-tags"
                                    name="tags"
-                                   value="{{ old('tags', $post->tags->pluck('name'))->implode(', ') }}"
-                                   required=""
+                                   value="{{ old('tags', $post->tags->pluck('name')->implode(', ')) }}"
                             >
-
-                            <div class="invalid-feedback">
-                                Post Description is required.
-                            </div>
-
-                            @error('description')
-                            <div class="alert alert-danger">
-                                {{ $message }}
-                            </div>
-                            @enderror
                         </div>
 
                         <div class="form__field form-check mb-2">
diff --git a/resources/views/posts/index.blade.php b/resources/views/posts/index.blade.php
index 342d8d1..af3936c 100644
--- a/resources/views/posts/index.blade.php
+++ b/resources/views/posts/index.blade.php
@@ -24,6 +24,14 @@
 
                                         <p class="post__preview card-text mb-auto text-justify" style="height: 115px"> {{ str_limit($post->text, $limit = 100, $end = '...') }} </p>
 
+                                        @if($post->tags->isNotEmpty())
+                                            <div class="post__tags mb-2">
+                                                @foreach($post->tags as $tag)
+                                                    <span class="badge badge-info text-white">{{ $tag->name }}</span>
+                                                @endforeach
+                                            </div>
+                                        @endif
+
                                         <a href="{{ route('post-show', $post->id) }}" class="post__view">Continue reading</a>
                                     </div>
 
diff --git a/resources/views/tags/index.blade.php b/resources/views/tags/index.blade.php
deleted file mode 100644
index b3d9bbc..0000000
--- a/resources/views/tags/index.blade.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php