diff --git a/device-app/resources/views/deviceDetail.blade.php b/device-app/resources/views/deviceDetail.blade.php
index 5a380d8..5543fca 100644
--- a/device-app/resources/views/deviceDetail.blade.php
+++ b/device-app/resources/views/deviceDetail.blade.php
@@ -1,9 +1,15 @@
-<h1>Device Detail</h1>
-<h2>{{ $device['device_id'] }}</h2>
-<h2>{{ $device['title'] }}</h2>
-<h2>{{ $device['device_type'] }}</h2>
-<h2>{{ $device['description'] }}</h2>
-<h2>{{ $device['accessories'] }}</h2>
-<h2>{{ $device['rz_username_buyer'] }}</h2>
-<h2>{{ $device['serial_number'] }}</h2>
-<h2>{{ $device['image_url'] }}</h2>
+@extends('layout')
+
+@section('content')
+    <h1>Device Detail</h1>
+    <ul>
+        <li>{{ $device['device_id'] }}</li>
+        <li>{{ $device['title'] }}</li>
+        <li>{{ $device['device_type'] }}</li>
+        <li>{{ $device['description'] }}</li>
+        <li>{{ $device['accessories'] }}</li>
+        <li>{{ $device['rz_username_buyer'] }}</li>
+        <li>{{ $device['serial_number'] }}</li>
+        <li>{{ $device['image_url'] }}</li>
+    </ul>
+@endsection
\ No newline at end of file
diff --git a/device-app/resources/views/deviceList.blade.php b/device-app/resources/views/deviceList.blade.php
index a8e793c..ab48492 100644
--- a/device-app/resources/views/deviceList.blade.php
+++ b/device-app/resources/views/deviceList.blade.php
@@ -1,10 +1,16 @@
-<h1>Device List</h1>
-@unless(count($devices) == 0)
-    @foreach ($devices as $device)
-        <h2>
-            <a href="/devices/{{ $device['device_id'] }}">{{$device['title']}}</<a>
-        </h2>
-    @endforeach
-@else
-    <p>No devices</p>
-@endunless
+@extends('layout')
+
+@section('content')
+    <h1>Device List</h1>
+    @unless(count($devices) == 0)
+        <ul>
+            @foreach ($devices as $device)
+                <li>
+                    <a href="/devices/{{ $device['device_id'] }}">{{ $device->title }}</a>
+                </li>
+            @endforeach
+        </ul>
+    @else
+        <p>No devices found</p>
+    @endunless
+@endsection
\ No newline at end of file
diff --git a/device-app/resources/views/layout.blade.php b/device-app/resources/views/layout.blade.php
new file mode 100644
index 0000000..630b1dc
--- /dev/null
+++ b/device-app/resources/views/layout.blade.php
@@ -0,0 +1,25 @@
+<!DOCTYPE html>
+<html>
+
+<head>
+    <title>Device Manager</title>
+</head>
+
+<body>
+    <nav>
+        <ul>
+            <li><a href="/">Home</a></li>
+        </ul>
+    </nav>
+    <main>
+        <h1>Device Manager</h1>
+        <div class="container">
+            @yield('content')
+        </div>
+    </main>
+    <footer>
+        <p>&copy; 2023 My Website. All rights reserved.</p>
+    </footer>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/device-app/resources/views/welcome.blade.php b/device-app/resources/views/welcome.blade.php
index f47aba5..0dc3ef3 100644
--- a/device-app/resources/views/welcome.blade.php
+++ b/device-app/resources/views/welcome.blade.php
@@ -1 +1,6 @@
-<h1>Welcome</h1>
\ No newline at end of file
+@extends('layout')
+
+@section('content')
+    <h1>Welcome</h1>
+    <a href="/devices">To List</a>
+@endsection
\ No newline at end of file
