diff --git a/.github/workflows/copilot-instructions.md b/.github/workflows/copilot-instructions.md
index 7499d5e..5aea2d1 100644
--- a/.github/workflows/copilot-instructions.md
+++ b/.github/workflows/copilot-instructions.md
@@ -1,8 +1,8 @@
 ---
 description: TechBlog CMS repository-wide Copilot instructions
 mode: agent
-tools: ['extensions', 'codebase', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'terminalSelection', 'terminalLastCommand', 'openSimpleBrowser', 'fetch', 'findTestFiles', 'searchResults', 'githubRepo', 'getPythonEnvironmentInfo', 'getPythonExecutableCommand', 'installPythonPackage', 'configurePythonEnvironment', 'runTests', 'runCommands', 'runTasks', 'editFiles', 'runNotebooks', 'search']
-model: Grok Code Fast 1 (Preview)
+tools: ['edit', 'runNotebooks', 'search', 'new', 'runCommands', 'runTasks', 'github/add_comment_to_pending_review', 'github/add_issue_comment', 'github/add_sub_issue', 'github/assign_copilot_to_issue', 'github/cancel_workflow_run', 'github/create_and_submit_pull_request_review', 'github/create_branch', 'github/create_gist', 'github/create_issue', 'github/create_pull_request', 'github/create_pull_request_with_copilot', 'github/create_repository', 'github/delete_file', 'github/delete_pending_pull_request_review', 'github/delete_workflow_run_logs', 'github/get_commit', 'github/get_dependabot_alert', 'github/get_discussion', 'github/get_issue', 'github/get_issue_comments', 'github/get_job_logs', 'github/get_latest_release', 'github/get_pull_request', 'github/get_pull_request_comments', 'github/get_pull_request_diff', 'github/get_pull_request_files', 'upstash/context7/*', 'github/github-mcp-server/get_code_scanning_alert', 'github/github-mcp-server/get_commit', 'github/github-mcp-server/get_copilot_space', 'github/github-mcp-server/get_dependabot_alert', 'github/github-mcp-server/get_file_contents', 'github/github-mcp-server/get_global_security_advisory', 'github/github-mcp-server/get_issue', 'github/github-mcp-server/get_issue_comments', 'github/github-mcp-server/get_job_logs', 'github/github-mcp-server/get_label', 'github/github-mcp-server/get_latest_release', 'github/github-mcp-server/get_me', 'github/github-mcp-server/get_notification_details', 'github/github-mcp-server/get_project', 'github/github-mcp-server/get_project_field', 'github/github-mcp-server/get_project_item', 'github/github-mcp-server/get_release_by_tag', 'github/github-mcp-server/get_secret_scanning_alert', 'github/github-mcp-server/get_tag', 'github/github-mcp-server/get_team_members', 'github/github-mcp-server/get_teams', 'github/github-mcp-server/get_workflow_run', 'github/github-mcp-server/get_workflow_run_logs', 'github/github-mcp-server/get_workflow_run_usage', 'github/github-mcp-server/list_branches', 'github/github-mcp-server/list_code_scanning_alerts', 'github/github-mcp-server/list_commits', 'github/github-mcp-server/list_copilot_spaces', 'github/github-mcp-server/list_dependabot_alerts', 'github/github-mcp-server/list_discussion_categories', 'github/github-mcp-server/list_discussions', 'github/github-mcp-server/list_gists', 'github/github-mcp-server/list_global_security_advisories', 'github/github-mcp-server/list_issue_types', 'github/github-mcp-server/list_issues', 'github/github-mcp-server/list_label', 'github/github-mcp-server/list_notifications', 'github/github-mcp-server/list_org_repository_security_advisories', 'github/github-mcp-server/list_project_fields', 'github/github-mcp-server/list_project_items', 'github/github-mcp-server/list_projects', 'github/github-mcp-server/list_pull_requests', 'github/github-mcp-server/list_releases', 'github/github-mcp-server/list_repository_security_advisories', 'github/github-mcp-server/list_secret_scanning_alerts', 'github/github-mcp-server/list_starred_repositories', 'github/github-mcp-server/list_sub_issues', 'github/github-mcp-server/list_tags', 'github/github-mcp-server/list_workflow_jobs', 'github/github-mcp-server/list_workflow_run_artifacts', 'github/github-mcp-server/list_workflow_runs', 'github/github-mcp-server/list_workflows', 'github/github-mcp-server/pull_request_read', 'github/github-mcp-server/push_files', 'github/github-mcp-server/run_workflow', 'github/github-mcp-server/search_code', 'github/github-mcp-server/search_issues', 'github/github-mcp-server/search_pull_requests', 'github/github-mcp-server/search_repositories', 'github/github-mcp-server/update_issue', 'github/github-mcp-server/update_project_item', 'github/github-mcp-server/update_pull_request', 'github/github-mcp-server/update_pull_request_branch', 'github/github-mcp-server/web_search', 'usages', 'vscodeAPI', 'problems', 'changes', 'testFailure', 'openSimpleBrowser', 'fetch', 'githubRepo', 'extensions', 'todos', 'runTests']
+model: Copilot SWE (Preview)
 ---
 # .github/copilot-instructions.md
 
diff --git a/techblog_cms/static/favicon.png b/techblog_cms/static/favicon.png
new file mode 100644
index 0000000..636e2d8
Binary files /dev/null and b/techblog_cms/static/favicon.png differ
diff --git a/techblog_cms/templates/base.html b/techblog_cms/templates/base.html
index 608fddf..35dc3a3 100644
--- a/techblog_cms/templates/base.html
+++ b/techblog_cms/templates/base.html
@@ -5,6 +5,7 @@
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>{% block title %}TechBlog CMS{% endblock %}</title>
+    <link rel="icon" type="image/png" href="{% static 'favicon.png' %}" />
         <link href="https://cdn.jsdelivr.net/npm/tailwindcss@2.2.19/dist/tailwind.min.css" rel="stylesheet">
         <link href="https://cdn.jsdelivr.net/npm/@tabler/icons-webfont@latest/tabler-icons.min.css" rel="stylesheet">
         <link href="{% static 'css/style.css' %}" rel="stylesheet">
diff --git a/techblog_cms/templates/components/header.html b/techblog_cms/templates/components/header.html
index 45c2679..8c44a1c 100644
--- a/techblog_cms/templates/components/header.html
+++ b/techblog_cms/templates/components/header.html
@@ -18,10 +18,17 @@
                     <a href="{% url 'home' %}" class="text-gray-600 hover:text-gray-900">Home</a>
                     <a href="{% url 'article_list' %}" class="text-gray-600 hover:text-gray-900">Articles</a>
                     <a href="{% url 'categories' %}" class="text-gray-600 hover:text-gray-900">Categories</a>
+                    {% if request.user.is_authenticated %}
+                    <a href="{% url 'article_new' %}" class="px-4 py-2 bg-blue-500 text-white font-semibold rounded hover:bg-blue-600 transition">
+                        Submit Article
+                    </a>
+                    <a href="{% url 'logout' %}" class="text-gray-600 hover:text-gray-900">ログアウト</a>
+                    {% else %}
                     <a href="{% url 'login' %}" class="px-4 py-2 bg-blue-500 text-white font-semibold rounded hover:bg-blue-600 transition">
                         ログイン
                     </a>
                     <a href="#" class="text-blue-500 hover:underline">ユーザー登録</a>
+                    {% endif %}
                 </div>
 
                 <!-- Mobile menu button -->
@@ -45,10 +52,17 @@
         <!-- Mobile navigation menu -->
         <div id="mobile-menu" class="hidden md:hidden pb-4 border-t border-gray-200">
             <div class="pt-4 flex flex-col space-y-3">
-                <a href="{% url 'login' %}" class="text-gray-700 hover:text-blue-600 font-medium">ログイン</a>
+                <a href="{% url 'home' %}" class="text-gray-700 hover:text-blue-600 font-medium">ホーム</a>
                 <a href="{% url 'article_list' %}" class="text-gray-700 hover:text-blue-600 font-medium">記事一覧</a>
                 <a href="{% url 'categories' %}" class="text-gray-700 hover:text-blue-600 font-medium">カテゴリ一覧</a>
                 <a href="{% url 'tags' %}" class="text-gray-700 hover:text-blue-600 font-medium">タグ一覧</a>
+                {% if request.user.is_authenticated %}
+                    <a href="{% url 'article_new' %}" class="text-gray-700 hover:text-blue-600 font-medium">記事を投稿</a>
+                    <a href="{% url 'logout' %}" class="text-gray-700 hover:text-blue-600 font-medium">ログアウト</a>
+                {% else %}
+                    <a href="{% url 'login' %}" class="text-gray-700 hover:text-blue-600 font-medium">ログイン</a>
+                    <a href="#" class="text-blue-500 hover:underline font-medium">ユーザー登録</a>
+                {% endif %}
             </div>
         </div>
     </nav>
diff --git a/techblog_cms/templates/dashboard.html b/techblog_cms/templates/dashboard.html
index cbe8201..e3102b7 100644
--- a/techblog_cms/templates/dashboard.html
+++ b/techblog_cms/templates/dashboard.html
@@ -1,5 +1,7 @@
 {% extends 'base.html' %}
-{% block header %}{% endblock %}
+{% block header %}
+  {% include 'components/header.html' %}
+{% endblock %}
 {% block sidebar %}{% endblock %}
 {% block content %}
 <!-- CSRFトークンを非表示で配置 -->
diff --git a/techblog_cms/templates/login.html b/techblog_cms/templates/login.html
index affefb8..088435a 100644
--- a/techblog_cms/templates/login.html
+++ b/techblog_cms/templates/login.html
@@ -1,5 +1,21 @@
 {% extends 'base.html' %}
-{% block header %}{% endblock %}
+{% block header %}
+<header class="fixed top-0 w-full bg-white shadow-sm z-50">
+  <nav class="container mx-auto px-4">
+    <div class="flex items-center justify-between h-20">
+      <a href="{% url 'home' %}" class="flex-shrink-0 text-xl font-bold text-gray-800">
+        TechBlog CMS
+      </a>
+      <div class="flex items-center space-x-6 text-sm font-medium text-gray-600">
+        <a href="{% url 'home' %}" class="hover:text-blue-600">Home</a>
+        <a href="{% url 'article_list' %}" class="hover:text-blue-600">Articles</a>
+        <a href="{% url 'categories' %}" class="hover:text-blue-600">Categories</a>
+        <a href="{% url 'tags' %}" class="hover:text-blue-600">Tags</a>
+      </div>
+    </div>
+  </nav>
+</header>
+{% endblock %}
 {% block sidebar %}{% endblock %}
 {% block content %}
 <div class="auth-container">