diff --git a/bloggy/forms/edit_profile_form.py b/bloggy/forms/edit_profile_form.py
index 045a199..0ab1c8b 100644
--- a/bloggy/forms/edit_profile_form.py
+++ b/bloggy/forms/edit_profile_form.py
@@ -1,6 +1,5 @@
 from django import forms
-from django.forms import ClearableFileInput
-
+from django.forms import ClearableFileInput, ModelForm, inlineformset_factory
 from bloggy.models import User
 
 
@@ -11,18 +10,20 @@ class NonClearableFileInput(ClearableFileInput):
 class EditProfileForm(forms.ModelForm):
     class Meta:
         model = User
-        help_texts={
-            "bio": "This will be displayed publicly on your profile. Keep it short and crisp."
+        help_texts = {
+            "bio": "This will be displayed publicly on your profile. Keep it short and crisp.",
+            'receive_news_updates': "News about product and feature updates",
+            'receive_new_content': "Get notified when new content is added"
+        }
+
+        labels = {
+            'receive_news_updates': "News and updates",
+            'receive_new_content': "New tutorials & courses"
         }
+
         fields = [
-            'profile_photo',
-            'name',
-            'website',
-            'twitter',
-            'linkedin',
-            'youtube',
-            'github',
-            'bio'
+            'profile_photo', 'name', 'website', 'twitter', 'linkedin', 'youtube', 'github', 'bio',
+            'receive_news_updates', 'receive_new_content'
         ]
 
         widgets = {
@@ -64,4 +65,13 @@ class Meta:
                 'rows': 5,
                 'placeholder': 'Your github'
             }),
+
+            'receive_news_updates': forms.CheckboxInput(attrs={
+                'class': 'form-check-input',
+            }),
+
+            'receive_new_content': forms.CheckboxInput(attrs={
+                'class': 'form-check-input',
+            }),
+
         }
diff --git a/bloggy/migrations/0008_user_receive_new_content_user_receive_news_updates.py b/bloggy/migrations/0008_user_receive_new_content_user_receive_news_updates.py
new file mode 100644
index 0000000..60ce011
--- /dev/null
+++ b/bloggy/migrations/0008_user_receive_new_content_user_receive_news_updates.py
@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-01-10 14:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('bloggy', '0007_alter_post_difficulty_alter_post_post_type_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='receive_new_content',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.AddField(
+            model_name='user',
+            name='receive_news_updates',
+            field=models.BooleanField(default=True),
+        ),
+    ]
diff --git a/bloggy/models/user.py b/bloggy/models/user.py
index c225e1e..2d3357d 100644
--- a/bloggy/models/user.py
+++ b/bloggy/models/user.py
@@ -66,6 +66,8 @@ class User(AbstractBaseUser, ResizeImageMixin, PermissionsMixin):
     youtube = models.CharField(max_length=100, null=True, blank=True)
     github = models.CharField(max_length=100, null=True, blank=True)
     bio = models.TextField(max_length=250, null=True, blank=True)
+    receive_news_updates = models.BooleanField(default=True)
+    receive_new_content = models.BooleanField(default=True)
 
     class Meta:
         db_table = "bloggy_user"
diff --git a/bloggy/templates/.DS_Store b/bloggy/templates/.DS_Store
index 3ce9dd1..5c08fbd 100644
Binary files a/bloggy/templates/.DS_Store and b/bloggy/templates/.DS_Store differ
diff --git a/bloggy/templates/pages/user_profile.html b/bloggy/templates/pages/user_profile.html
index 721cdfc..7921d05 100644
--- a/bloggy/templates/pages/user_profile.html
+++ b/bloggy/templates/pages/user_profile.html
@@ -39,9 +39,13 @@ <h1 class="h2 my-3">{{ userProfile.username }}</h1>
         <div class="py-3 pb-md-5">
             <h1 class="h2 py-3 px-2">My articles(so far)</h1>
             <div class="row row-cols-1 row-cols-md-2 row-cols-lg-2 g-3 mb-3">
-                {% for post in posts %}
-                    <div class="col">{% include "partials/post_list_item.html" with post=post cssClass="" %}</div>
-                {% endfor %}
+                {% if posts|length <= 0 %}
+                    <p class="lead my-3 text-muted">Currently, there are no published posts.</p>
+                {% else %}
+                    {% for post in posts %}
+                        <div class="col">{% include "partials/post_list_item.html" with post=post cssClass="" %}</div>
+                    {% endfor %}
+                {% endif %}
             </div>
             {% include 'partials/paging.html' with posts=posts %}
 
diff --git a/bloggy/templates/partials/article_row_list.html b/bloggy/templates/partials/article_row_list.html
index afcb2be..604a71f 100644
--- a/bloggy/templates/partials/article_row_list.html
+++ b/bloggy/templates/partials/article_row_list.html
@@ -7,41 +7,39 @@
         <div class="d-flex align-items-center">
             <div class="flex-grow-1">
                 <div class="hero article-meta-container mb-2" style="font-size: 0.75rem">
-                    <small class="d-inline-block mb-1 text-muted text-uppercase">Updated on {{ article.updated_date|date:"M j, Y" }}</small>
-
-                    {% if  article.publish_status == 'DRAFT' %}
-                        <span class="ms-3 badge-meta-pill {{ article.publish_status | lower }}">{{ article.publish_status | capfirst }}</span>
+                    <small class="d-inline-block mb-1 text-muted text-uppercase">Updated
+                        on {{ post.updated_date|date:"M j, Y" }}</small>
+                    {% if  post.publish_status == 'DRAFT' %}
+                        <span class="ms-3 badge-meta-pill {{ post.publish_status | lower }}">{{ post.publish_status | capfirst }}</span>
                     {% endif %}
-                    <span class="ms-3 badge-meta-pill {{ article.post_type| lower }}">{{ article.post_type | capfirst }}</span>
-
-
+                    <span class="ms-3 badge-meta-pill {{ post.post_type| lower }}">{{ post.post_type | capfirst }}</span>
                 </div>
-                <h3 class="h3 fw-500 mb-2">
-                    <a href="{% url 'post_single' slug=article.slug %}"
-                       class="text-decoration-none link-dark">{{ article.title }}</a>
+                <h3 class="h4 fw-500 mb-2">
+                    <a href="{% url 'post_single' slug=post.slug %}"
+                       class="text-decoration-none link-dark">{{ post.title }}</a>
                 </h3>
 
 
-                {% if article.author.username == user.username %}
+                {% if post.author.username == user.username %}
                     <small class="me-3 text-muted text-uppercase" style="font-size:0.75rem">
                         <i class="fa-solid fa-signal"></i>&nbsp;
-                        {% get_hit_count for article %} views
+                        {% get_hit_count for post %} views
                     </small>
 
-
                     <small class="me-3 text-muted text-uppercase" style="font-size:0.75rem">
                         <i class="fa-regular fa-comment"></i>
-                        {{ article.get_comments_count }} comments
+                        {{ post.get_comments_count }} comments
                     </small>
-                    <a class="btn btn-sm btn-xs btn-light me-3" href="{{ article.get_admin_url }}"><i class="fa-regular fa-pen-to-square"></i> Edit</a>
+                    <a class="btn btn-sm btn-xs btn-outline-primary me-3" href="{{ post.get_admin_url }}"><i
+                            class="fa-regular fa-pen-to-square"></i> Edit</a>
                 {% endif %}
 
             </div>
 
             <div class="flex-shrink-0 ms-3">
-                {% if article.thumbnail %}
+                {% if post.thumbnail %}
                     <div class="archive-media-object" style="max-width: 100px">
-                        <img loading="lazy" src="{{ article.thumbnail.url }}" alt="{{ article.title }}" height="auto">
+                        <img loading="lazy" src="{{ post.thumbnail.url }}" alt="{{ post.title }}" height="auto">
                     </div>
                 {% endif %}
             </div>
diff --git a/bloggy/templates/partials/dashboard_menu.html b/bloggy/templates/partials/dashboard_menu.html
index 17f551c..4db528d 100644
--- a/bloggy/templates/partials/dashboard_menu.html
+++ b/bloggy/templates/partials/dashboard_menu.html
@@ -1,18 +1,25 @@
 {% load static %}
 {% load custom_widgets %}
-<div class="card card-bordered card-shadowd p-4">
+<div class="card card-bordered card-shadowdd p-4 mb-3">
     <a href="{% url 'index' %}" class="pb-3 text-decoration-none link-dark link-offset-2 fw-600">Home</a>
     <hr class="m-0 opacity-25">
     <a href="{% url 'profile.account' %}" class="py-3 text-decoration-none link-dark link-offset-2 fw-600">Account</a>
     <hr class="m-0 opacity-25">
 
-    <a href="{% url 'user_profile' username=user.username %}" 
-       class="py-3 text-decoration-none link-dark link-offset-2 fw-600">Your profile</a>
+    <a href="{% url 'profile.dashboard' %}" class="py-3  text-decoration-none link-dark link-offset-2 fw-600">
+        Dashboard</a>
     <hr class="m-0 opacity-25">
 
+    {% if user.is_staff %}
+        <a href="{% url 'user_profile' username=user.username %}"
+           class="py-3 text-decoration-none link-dark link-offset-2 fw-600">Your profile<i
+                class="fa-solid fa-arrow-up-right-from-square float-lg-end ms-3"></i></a>
+        <hr class="m-0 opacity-25">
+    {% endif %}
+
     {% if user.is_superuser %}
         <a href="{% url 'admin:index' %}" class="py-3  text-decoration-none link-dark link-offset-2 fw-600">
-            Dashboard</a>
+            Admin panel<i class="fa-solid fa-arrow-up-right-from-square float-lg-end ms-3"></i></a>
         <hr class="m-0 opacity-25">
     {% endif %}
 
diff --git a/bloggy/templates/partials/header.html b/bloggy/templates/partials/header.html
index 7f29add..9e3a351 100644
--- a/bloggy/templates/partials/header.html
+++ b/bloggy/templates/partials/header.html
@@ -52,25 +52,35 @@
                                 <hr>
 
                                 <ul class="navbar-nav flex-shrink-0">
-                                 <li class="nav-item">
-                                        <a class="nav-link py-3">{% if user.name %}Hello, {{ request.user.name }}{% else %}
-                                    My Account{% endif %}</a>
+                                    <li class="nav-item">
+                                        <a class="nav-link py-3">{% if user.name %}Hello,
+                                            {{ request.user.name }}{% else %}
+                                            My Account{% endif %}</a>
                                     </li>
 
                                     <li class="nav-item">
-                                        <a class="nav-link py-3" href="{% url 'profile.edit_profile' %}">Edit
-                                            profile</a>
+                                        <a href="{% url 'profile.account' %}" class="nav-link py-3">Account</a>
                                     </li>
-{#                                    <li class="nav-item">#}
-{#                                        <a class="nav-link py-3" href="{% url 'profile.bookmarks' %}">Bookmarks</a>#}
-{#                                    </li>#}
 
+                                    <li class="nav-item">
+                                        <a href="{% url 'profile.dashboard' %}" class="nav-link py-3">Dashboard</a>
+                                    </li>
+
+                                    {% if user.is_staff %}
+                                        <li class="nav-item">
+                                            <a class="nav-link py-3"
+                                               href="{% url 'user_profile' username=user.username %}">Your profile<i
+                                                    class="fa-solid fa-arrow-up-right-from-square float-lg-end ms-3"></i></a>
+                                        </li>
+                                    {% endif %}
 
                                     {% if user.is_superuser %}
                                         <li class="nav-item">
-                                            <a class="nav-link py-3" href="{% url 'admin:index' %}">Dashboard</a>
+                                            <a class="nav-link py-3" href="{% url 'admin:index' %}">Admin panel<i
+                                                    class="fa-solid fa-arrow-up-right-from-square float-lg-end ms-3"></i></a>
                                         </li>
                                     {% endif %}
+
                                     <hr>
                                     <li class="nav-item">
                                         <a class="nav-link text-danger py-3"
@@ -111,32 +121,44 @@
 
                             <div class="dropdown custom-dropdown">
                                 <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
-{#                                    <p class="menu-heading font-xs pt-2">#}
-                                <li class="nav-item">
-                                    <a class="dropdown-item"><span class="menu-heading">{% if user.name %}<span class="me-2">👋</span>Hello, {{ user.name }}{% else %}My Account{% endif %}</span></a>
+                                    <li class="nav-item">
+                                        <a class="dropdown-item"><span class="menu-heading">
+                                            <span class="me-2">👋</span>Hello, {{ user.name }}</span>
+                                        </a>
                                     </li>
 
-                                    {% if user.is_superuser %}
+                                    <li class="nav-item">
+                                        <a class="dropdown-item" href="{% url 'profile.account' %}"><i
+                                                class="fa-solid fa-user me-2"></i>My Account</a>
+                                    </li>
+
+                                    <li class="nav-item">
+                                        <a class="dropdown-item" href="{% url 'profile.dashboard' %}"><i
+                                                class="fa-solid fa-gauge me-2"></i>Dashboard</a>
+                                    </li>
+
+                                    {% if user.is_staff %}
                                         <li class="nav-item">
-                                            <a class="dropdown-item" href="{% url 'index' %}"><i class="fa-solid fa-house me-2"></i>Home</a>
+                                            <a class="dropdown-item"
+                                               href="{% url 'user_profile' username=user.username %}"><i
+                                                    class="fa-solid fa-arrow-up-right-from-square me-2"></i>Your Profile</a>
                                         </li>
                                     {% endif %}
 
-                                     <li class="nav-item">
-                                            <a class="dropdown-item" href="{% url 'profile.account' %}"><i class="fa-solid fa-user me-2"></i>My Account</a>
-                                     </li>
-
                                     <li class="nav-item">
-                                            <a class="dropdown-item" href="#" data-bs-toggle="modal" data-bs-target="#feedbackModal"><i class="fa-solid fa-comments me-2"></i>Give Feedback</a>
+                                        <a class="dropdown-item" href="#" data-bs-toggle="modal"
+                                           data-bs-target="#feedbackModal"><i class="fa-solid fa-comments me-2"></i>Give
+                                            Feedback</a>
                                     </li>
 
-
-{#                                    <a class="dropdown-item" href="{% url 'profile.edit_profile' %}">Edit profile</a>#}
-{#                                    <a class="dropdown-item" href="{% url 'profile.bookmarks' %}">Bookmarks</a>#}
                                     {% if user.is_superuser %}
-                                        <a class="dropdown-item" href="{% url 'admin:index' %}"><i class="fa-solid fa-gauge me-2"></i>Dashboard</a>
+                                        <li class="nav-item">
+                                            <a class="dropdown-item" href="{% url 'admin:index' %}"><i
+                                                    class="fa-solid fa-gauge me-2"></i>Admin Panel</a>
+                                        </li>
                                     {% endif %}
                                     <hr>
+
                                     <a class="dropdown-item text-danger"
                                        href="{% url 'logout' %}?next={{ request.path }}">
                                         <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16"
diff --git a/bloggy/templates/profile/account_view.html b/bloggy/templates/profile/account_view.html
index b4a6027..7360976 100644
--- a/bloggy/templates/profile/account_view.html
+++ b/bloggy/templates/profile/account_view.html
@@ -30,11 +30,11 @@
 
     <div class="container mt-5">
         <div class="row">
-            <div class="col-lg-3">
-                {% include 'partials/dashboard_menu.html' %}
+            <div class="col-12 col-lg-3 col-xl-3">
+                {% include 'partials/dashboard_menu.html' with user=user %}
             </div>
 
-            <div class="col-lg-7">
+            <div class="col-12 col-lg-9 col-xl-7">
                 <div class="card p-lg-5 p-3 card-bordered card-shadowd">
                     <h1 class="h2">Account details</h1>
                     <p>Manage your account settings such as username, password, and personal information.</p>
@@ -64,8 +64,7 @@ <h4 class="h4 mb-0">Joined on</h4>
 
                     </div>
                     <div class="mb-3">
-                        <a href="{% url 'profile.account.change_password' %}" class="btn border-2 btn-outline-primary"
-                           target="_blank">Change password</a>
+                        <a href="{% url 'profile.account.change_password' %}" class="btn border-2 btn-outline-primary">Change password</a>
                     </div>
 
                     <div class="d-flex justify-content-between mt-5">
@@ -81,9 +80,9 @@ <h3 class="h3 mb-4"><span class="">Personal</span> information</h3>
                         <div class="col-12">
                             <h4 class="h4 mb-0">Profile photo</h4>
                             <img src="{{ user.get_avatar }}" alt=""
-                             class="img-fluid rounded-circled mt-2 mb-3" id="profile_photo_preview"
-                             height="100px"
-                             width="100px">
+                                 class="img-fluid rounded-circled mt-2 mb-3" id="profile_photo_preview"
+                                 height="100px"
+                                 width="100px">
                         </div>
 
                         <div class="col-12 col-lg-6">
@@ -116,6 +115,22 @@ <h4 class="h4 mb-0">Bio</h4>
                             <p class="text-muted">{% if user.bio %}{{ user.bio }}{% else %}-{% endif %}</p>
                         </div>
                     </div>
+
+
+                    <h2 class="h3 mt-4 mb-2">Notification settings</h2>
+                    <div class="custom-form">
+                        <div class="col-md-12 my-2">
+                            <input type="checkbox" name="receive_news_updates" class="form-check-input" id="id_receive_news_updates"  {% if user.receive_news_updates %}checked{% endif %} style="pointer-events: none;">
+                            <label class="form-check-label px-2" for="id_receive_news_updatesd">News and updates</label>
+                            <span id="emailHelp" class="helptext ms-4 text-muted">News about product and feature updates</span>
+                        </div>
+
+                        <div class="col-md-12 mt-3">
+                            <input type="checkbox" name="receive_new_content" class="form-check-input" id="id_receive_new_content" {% if user.receive_new_content %}checked{% endif %} style="pointer-events: none;">
+                            <label class="form-check-label px-2" for="id_receive_new_contentd">New tutorials&amp; courses</label>
+                            <span id="emailHelp" class="helptext ms-4 text-muted">Get notified when new content is added</span>
+                        </div>
+                    </div>
                 </div>
             </div>
         </div>
diff --git a/bloggy/templates/profile/change_password.html b/bloggy/templates/profile/change_password.html
index 949b8c8..ff980e3 100644
--- a/bloggy/templates/profile/change_password.html
+++ b/bloggy/templates/profile/change_password.html
@@ -23,18 +23,18 @@
 
     <div class="container mt-5">
         <div class="row">
-            <div class="col-lg-3">
+            <div class="col-12 col-lg-3 col-xl-3">
                 {% include 'partials/dashboard_menu.html' with user=user %}
             </div>
 
-            <div class="col-lg-7">
+            <div class="col-12 col-lg-9 col-xl-7">
                 <div class="card p-lg-5 p-3 card-bordered card-shadowd">
-                    <h1 class="h2">Change Password</h1>
+                    <h1 class="h2">Change password</h1>
                     <form method="post" action="" class="col-12 col-lg-9 custom-form">
                         {% csrf_token %}
                         {{ form.as_p }}
                         <div class="form-group mt-4">
-                            <button type="submit" class="btn btn-primary">Change Password</button>
+                            <button type="submit" class="btn btn-primary">Change password</button>
                         </div>
                     </form>
                 </div>
diff --git a/bloggy/templates/profile/edit_profile.html b/bloggy/templates/profile/edit_profile.html
index 8547e86..6eb9f83 100644
--- a/bloggy/templates/profile/edit_profile.html
+++ b/bloggy/templates/profile/edit_profile.html
@@ -23,13 +23,13 @@
 
     <div class="container mt-5">
         <div class="row">
-            <div class="col-lg-3">
+            <div class="col-12 col-lg-3 col-xl-3">
                 {% include 'partials/dashboard_menu.html' with user=user %}
             </div>
 
-            <div class="col-lg-7">
+            <div class="col-12 col-lg-9 col-xl-7">
                 <div class="card p-lg-5 p-3 card-bordered card-shadowd">
-                    <h1 class="h2">Update profile</h1>
+                    <h1 class="h2">Edit personal information</h1>
                     {% if user_form.errors %}
                         <div class="alert alert-danger alert-dismissible" role="alert">
                             <div id="form_errors">
@@ -53,20 +53,35 @@ <h1 class="h2">Update profile</h1>
 
                         <div class="row">
                             {% for field in form.visible_fields %}
-                                <div class="{% if field.name == 'profile_photo' or field.name == 'bio' %} col-md-12 {% else %} col-md-6 {% endif %} my-2">
-                                    {% if field.name == "profile_photo" %}
-                                    {% else %}
-                                        {{ field.label_tag }}
-                                    {% endif %}
-                                    <small class="errors"> {{ field.errors }}</small>
-                                    {{ field }}
-                                    <span id="emailHelp" class="helptext">{{ field.help_text }}</span>
-                                    {% if field.name == "profile_photo" %}
+                                {% if field.name == 'receive_news_updates' or field.name ==  'receive_new_content' %}
+                                    {% if field.name == 'receive_news_updates' %}
+                                        <h2 class="h3 mt-4 mb-2">Notification settings</h2>
                                     {% endif %}
-                                </div>
+
+                                    <div class="col-md-12 my-2">
+                                        {{ field }}
+                                        <label class="form-check-label px-2"
+                                               for="{{ field.auto_id }}">{{ field.label }}</label>
+                                        <small class="errors"> {{ field.errors }}</small>
+                                        <span id="emailHelp"
+                                              class="helptext ms-4 text-muted">{{ field.help_text }}</span>
+                                    </div>
+                                {% else %}
+
+                                    <div class="{% if field.name == 'profile_photo' or field.name == 'bio' %} col-md-12 {% else %} col-md-6 {% endif %} my-2">
+                                        {% if field.name == "profile_photo" %}
+                                        {% else %}
+                                            <label for="{{ field.auto_id }}">{{ field.label }}</label>
+                                        {% endif %}
+                                        <small class="errors"> {{ field.errors }}</small>
+                                        {{ field }}
+                                        <span id="emailHelp" class="helptext">{{ field.help_text }}</span>
+                                        {% if field.name == "profile_photo" %}
+                                        {% endif %}
+                                    </div>
+                                {% endif %}
                             {% endfor %}
                         </div>
-
                         <div class="form-group my-4 col-md-12">
                             <button type="submit" class="btn btn-primary">Save changes</button>
                         </div>
diff --git a/bloggy/templates/profile/my_dashboard_view.html b/bloggy/templates/profile/my_dashboard_view.html
new file mode 100644
index 0000000..02edf66
--- /dev/null
+++ b/bloggy/templates/profile/my_dashboard_view.html
@@ -0,0 +1,34 @@
+{% extends "base-with-header-footer.html" %}
+{% load static %}
+{% load custom_widgets %}
+{% block base_css_class %}bg-white{% endblock base_css_class %}
+{% block content %}
+<div class="container mt-5">
+    <div class="row">
+        <div class="col-12 col-lg-3 col-xl-3">
+            {% include 'partials/dashboard_menu.html' with user=user %}
+        </div>
+
+        <div class="col-12 col-lg-9 col-xl-8">
+            <div class="card p-lg-5 p-3 card-bordered card-shadowd">
+                <h1 class="h2">Dashboard</h1>
+
+
+                {% if posts|length <= 0 %}
+                    <p class="lead my-3 text-muted">Currently, there are no published posts.</p>
+                {% else %}
+                    {% for post in posts %}
+                        {% include 'partials/article_row_list.html' with post=post %}
+                    {% endfor %}
+                    {% include 'partials/paging.html' with posts=posts %}
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+    <div class="col-lg-3">
+    </div>
+</div>
+</div>
+
+{% endblock %}
\ No newline at end of file
diff --git a/bloggy/templates/profile/update_username.html b/bloggy/templates/profile/update_username.html
index 945dc67..4954e0d 100644
--- a/bloggy/templates/profile/update_username.html
+++ b/bloggy/templates/profile/update_username.html
@@ -23,18 +23,18 @@
 
     <div class="container mt-5">
         <div class="row">
-            <div class="col-lg-3">
+            <div class="col-12 col-lg-3 col-xl-3">
                 {% include 'partials/dashboard_menu.html' with user=user %}
             </div>
 
-            <div class="col-lg-7">
+            <div class="col-12 col-lg-9 col-xl-7">
                 <div class="card p-lg-5 p-3 card-bordered card-shadowd">
-                    <h1 class="h2">Update username</h1>
+                    <h1 class="h2">Change username</h1>
                     <form method="post" action="" class="col-12 col-lg-9 custom-form">
                         {% csrf_token %}
                         {{ form.as_p }}
                         <div class="form-group mt-4">
-                            <button type="submit" class="btn btn-primary">Update username</button>
+                            <button type="submit" class="btn btn-primary">Change username</button>
                         </div>
                     </form>
                 </div>
diff --git a/bloggy/templates/profile/user_bookmarks.html b/bloggy/templates/profile/user_bookmarks.html
index 6e2dc68..1bd5d7a 100644
--- a/bloggy/templates/profile/user_bookmarks.html
+++ b/bloggy/templates/profile/user_bookmarks.html
@@ -5,11 +5,11 @@
 {% block content %}
     <div class="container mt-5">
         <div class="row">
-            <div class="col-lg-2">
-                {% include 'partials/dashboard_menu.html' %}
+            <div class="col-12 col-lg-3 col-xl-3">
+                {% include 'partials/dashboard_menu.html' with user=user %}
             </div>
 
-            <div class="col-lg-9">
+            <div class="col-12 col-lg-9 col-xl-7">
                 {% if posts %}
                     <div class="bg-white padding-medium">
                         <h1 class="display-3 fw-600 pb-2">Bookmarks</h1>
diff --git a/bloggy/urls.py b/bloggy/urls.py
index f9a3916..ddbfdab 100644
--- a/bloggy/urls.py
+++ b/bloggy/urls.py
@@ -36,6 +36,7 @@
 from .views.account import AccountActivationView
 from .views.account_view import AccountView
 from .views.change_password_view import ChangePasswordView
+from .views.my_dashboard_view import DashboardView
 from .views.posts import PostListView, PostDetailsView
 from .views.login import MyLoginView
 from .views.pages import AdsTextView, robots
@@ -93,7 +94,7 @@
     path('edit-profile', login_required(EditProfileView.as_view()), name="profile.edit_profile"),
     path('account/update-username', login_required(UpdateUsernameView.as_view()), name='profile.account.update_username'),
     path('account/change-password', login_required(ChangePasswordView.as_view()), name='profile.account.change_password'),
-    # path('dashboard', login_required(MyProfileView.as_view()), name="profile.dashboard"),
+    path('dashboard', login_required(DashboardView.as_view()), name="profile.dashboard"),
     # path('bookmarks', login_required(UserBookmarksView.as_view()), name="profile.bookmarks"),
 
     path('contact', TemplateView.as_view(template_name="pages/contact.html"), name='pages.contact'),
@@ -110,7 +111,6 @@
     path('summernote/', include('django_summernote.urls')),
     path('api/1.0/', include('bloggy_api.urls')),
 
-
 ]
 
 if settings.DEBUG:
diff --git a/bloggy/views/edit_profile_view.py b/bloggy/views/edit_profile_view.py
index b350004..058350a 100644
--- a/bloggy/views/edit_profile_view.py
+++ b/bloggy/views/edit_profile_view.py
@@ -1,6 +1,7 @@
 import os
 
 from django.contrib import messages
+from django.contrib.auth.mixins import LoginRequiredMixin
 from django.shortcuts import get_object_or_404, redirect
 from django.template.context_processors import static
 from django.urls import reverse
@@ -12,7 +13,7 @@
 from bloggy.templatetags.custom_widgets import sanitize_url
 
 
-class EditProfileView(FormView):
+class EditProfileView(LoginRequiredMixin, FormView):
     template_name = "profile/edit_profile.html"
     model = User
     form_class = EditProfileForm
@@ -20,7 +21,8 @@ class EditProfileView(FormView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['meta_title'] = "Update Profile"
-        context['meta_description'] = f"Update my profile. You need a {settings.SITE_TITLE}  account to sign in and view your profile."
+        context[
+            'meta_description'] = f"Update my profile. You need a {settings.SITE_TITLE} account to sign in and view your profile."
         context['meta_image'] = static('static/media/logo.png')
         return context
 
@@ -40,43 +42,38 @@ def get_initial(self):
             'twitter': user.twitter,
             'youtube': user.youtube,
             'github': user.github,
+            "receive_news_updates": user.receive_news_updates,
+            "receive_new_content": user.receive_new_content,
         })
 
         return initial
 
     def get_success_url(self):
         return reverse('profile.account')
-        # return self.request.get_full_path()
 
     def form_valid(self, form):
-        # This method is called when valid form data has been POSTed.
-        # It should return an HttpResponse.
+
+        profile_data = {
+            "name": form.cleaned_data["name"],
+            "bio": form.cleaned_data["bio"],
+            "website": sanitize_url(form.cleaned_data["website"]),
+            "twitter": sanitize_url(form.cleaned_data["twitter"]),
+            "youtube": sanitize_url(form.cleaned_data["youtube"]),
+            "linkedin": sanitize_url(form.cleaned_data["linkedin"]),
+            "github": sanitize_url(form.cleaned_data["github"]),
+            "receive_news_updates": form.cleaned_data["receive_news_updates"],
+            "receive_new_content": form.cleaned_data["receive_new_content"],
+        }
 
         if self.request.FILES.get("profile_photo", None) is not None:
-            # file_path = self.save_media_file(self.request.FILES["profile_photo"])
-            User.objects.filter(username=self.request.user.username).update(
-                profile_photo=self.request.FILES["profile_photo"],
-                name=form.cleaned_data["name"],
-                bio=form.cleaned_data["bio"],
-                website=sanitize_url(form.cleaned_data["website"]),
-                twitter=sanitize_url(form.cleaned_data["twitter"]),
-                youtube=sanitize_url(form.cleaned_data["youtube"]),
-                linkedin=sanitize_url(form.cleaned_data["linkedin"]),
-                github=sanitize_url(form.cleaned_data["github"])
-            )
-        else:
-            User.objects.filter(username=self.request.user.username).update(
-                name=form.cleaned_data["name"],
-                bio=form.cleaned_data["bio"],
-                website=sanitize_url(form.cleaned_data["website"]),
-                twitter=sanitize_url(form.cleaned_data["twitter"]),
-                youtube=sanitize_url(form.cleaned_data["youtube"]),
-                linkedin=sanitize_url(form.cleaned_data["linkedin"]),
-                github=sanitize_url(form.cleaned_data["github"])
-            )
-
-            messages.success(self.request, 'Your profile details have been successfully updated.')
+            profile_data["profile_photo"] = self.request.FILES["profile_photo"]
+
+        User.objects.update_or_create(
+            username=self.request.user.username,
+            defaults=profile_data
+        )
 
+        messages.success(self.request, 'Your profile details have been successfully updated.')
         return super().form_valid(form)
 
     def save_media_file(self, image):
diff --git a/bloggy/views/login.py b/bloggy/views/login.py
index e9b6b4a..1caad3e 100644
--- a/bloggy/views/login.py
+++ b/bloggy/views/login.py
@@ -1,9 +1,15 @@
 from django.contrib.auth.views import LoginView
+from django.shortcuts import redirect
 from django.urls import reverse
 
 
 class MyLoginView(LoginView):
 
+    def get(self, request):
+        if request.user and request.user.is_authenticated:
+            return redirect(reverse("profile.account"))
+        return super().get( request)
+
     def get_success_url(self):
         redirect_url = self.request.GET.get('next')
         if redirect_url:
diff --git a/bloggy/views/my_dashboard_view.py b/bloggy/views/my_dashboard_view.py
new file mode 100644
index 0000000..670b45f
--- /dev/null
+++ b/bloggy/views/my_dashboard_view.py
@@ -0,0 +1,43 @@
+from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
+from django.shortcuts import get_object_or_404
+from django.views.generic import DetailView
+
+from bloggy import settings
+from bloggy.models import User
+
+
+class DashboardView(DetailView):
+    template_name = "profile/my_dashboard_view.html"
+    DEFAULT_PAGE_SIZE = 12
+
+    def get_object(self, **kwargs):
+        username = self.request.user  # self.kwargs.get("username")
+        return get_object_or_404(User, username=username)
+
+    def get_context_data(self, *args, **kwargs):
+        context = super().get_context_data(*args, **kwargs)
+        user = self.get_object()
+
+        posts = user.posts.order_by("-published_date").filter(publish_status="LIVE")
+        paginator = Paginator(posts, self.DEFAULT_PAGE_SIZE)
+        page = self.request.GET.get('page')
+        try:
+            posts = paginator.page(page)
+        except PageNotAnInteger:
+            posts = paginator.page(1)
+        except EmptyPage:
+            posts = paginator.page(paginator.num_pages)
+
+        context.update({
+            'posts': posts,
+            'userProfile': user,
+            'userType': "self",
+        })
+
+        context['meta_title'] = "My Profile"
+        context[
+            'meta_description'] = f'My profile. Access your {settings.SITE_TITLE} profile, account settings My Profile.'
+        if user.profile_photo:
+            context['meta_image'] = settings.SITE_LOGO
+
+        return context
\ No newline at end of file
diff --git a/bloggy/views/user.py b/bloggy/views/user.py
index 02631c5..5ca3d9c 100644
--- a/bloggy/views/user.py
+++ b/bloggy/views/user.py
@@ -33,7 +33,7 @@ class PublicProfileView(DetailView):
 
     def get_object(self, queryset=None):
         username = self.kwargs['username']
-        if username == 'siteadmin' or username == 'admin' or username == 'superadmin':
+        if username in ('siteadmin', 'admin', 'superadmin'):
             raise Http404
         return get_object_or_404(User, username=username)