diff --git a/py_app/app/static/style.css b/py_app/app/static/style.css
index a694b56..583ab04 100644
--- a/py_app/app/static/style.css
+++ b/py_app/app/static/style.css
@@ -676,4 +676,18 @@ body.dark-mode .export-description {
     padding: 8px;
     text-align: left;
     border: 1px solid #ddd; /* Add borders to table cells */
+}
+
+.go-to-main-etichete-btn {
+    background-color: #28a745; /* Green background */
+    color: #fff; /* White text */
+    padding: 10px 20px;
+    border-radius: 5px;
+    text-decoration: none;
+    margin-left: 10px;
+    transition: background-color 0.3s ease;
+}
+
+.go-to-main-etichete-btn:hover {
+    background-color: #218838; /* Darker green on hover */
 }
\ No newline at end of file
diff --git a/py_app/app/templates/base.html b/py_app/app/templates/base.html
index 4d8dd19..9304b16 100644
--- a/py_app/app/templates/base.html
+++ b/py_app/app/templates/base.html
@@ -26,6 +26,9 @@
             </div>
             <div class="right-header">
                 <button id="theme-toggle" class="theme-toggle">Change to dark theme</button>
+                {% if request.endpoint in ['main.upload_data', 'main.print_module', 'main.label_templates', 'main.create_template'] %}
+                    <a href="{{ url_for('main.etichete') }}" class="btn go-to-main-etichete-btn">Main Page Etichete</a>
+                {% endif %}
                 <a href="{{ url_for('main.dashboard') }}" class="btn go-to-dashboard-btn">Go to Dashboard</a>
                 {% if 'user' in session %}
                     <span class="user-info">You are logged in as {{ session['user'] }}</span>
diff --git a/py_app/app/templates/create_template.html b/py_app/app/templates/create_template.html
index 7574426..020c300 100644
--- a/py_app/app/templates/create_template.html
+++ b/py_app/app/templates/create_template.html
@@ -3,40 +3,48 @@
 {% block title %}Create Template{% endblock %}
 
 {% block content %}
+<div class="card-container" style="display: flex; gap: 20px;">
     <!-- Left Column -->
-    <div class="left-column" style="flex: 1; display: flex; flex-direction: column; gap: 20px;">
-        <!-- Card 1: Dimensions -->
+    <div class="left-column" style="flex: 1; max-width: 33%;">
         <div class="dashboard-card">
-            <h3>Dimensions</h3>
-            <p>Set the dimensions of the label template:</p>
-            <form id="dimensions-form">
-                <label for="label-width">Width (mm):</label>
-                <input type="number" id="label-width" name="label_width" required>
-
-                <label for="label-height">Height (mm):</label>
-                <input type="number" id="label-height" name="label_height" required>
-
-                <button type="button" id="set-dimensions-btn" class="btn">Set Dimensions</button>
-            </form>
-        </div>
-
-        <!-- Card 2: Get Database Headers -->
-        <div class="dashboard-card">
-            <h3>Get Database Headers</h3>
-            <p>Retrieve column names from a selected database table:</p>
-            <button type="button" id="get-tables-btn" class="btn">Get Database Tables</button>
-            <div id="tables-container" style="margin-top: 10px;">
-                <!-- Tables will be dynamically populated here -->
+            <h3>Template Settings</h3>
+            <p>Set the dimensions and retrieve database headers for the label template:</p>
+            
+            <!-- Dimensions Section -->
+            <div>
+                <h4>Dimensions</h4>
+                <form id="dimensions-form">
+                    <div style="margin-bottom: 10px;">
+                        <label for="label-width">Width (mm):</label>
+                        <input type="number" id="label-width" name="label_width" required>
+                    </div>
+                    <div style="margin-bottom: 10px;">
+                        <label for="label-height">Height (mm):</label>
+                        <input type="number" id="label-height" name="label_height" required>
+                    </div>
+                    <button type="button" id="set-dimensions-btn" class="btn">Set Dimensions</button>
+                </form>
             </div>
-            <div id="columns-container" style="margin-top: 10px;">
-                <!-- Columns will be dynamically populated here -->
+
+            <hr style="margin: 20px 0;">
+
+            <!-- Get Database Headers Section -->
+            <div>
+                <h4>Get Database Headers</h4>
+                <p>Retrieve column names from a selected database table:</p>
+                <button type="button" id="get-tables-btn" class="btn">Get Database Tables</button>
+                <div id="tables-container" style="margin-top: 10px;">
+                    <!-- Tables will be dynamically populated here -->
+                </div>
+                <div id="columns-container" style="margin-top: 10px;">
+                    <!-- Columns will be dynamically populated here -->
+                </div>
             </div>
         </div>
     </div>
 
     <!-- Right Column -->
-    <div class="right-column" style="flex: 1;">
-        <!-- Card 3: Interactive Label Preview -->
+    <div class="right-column" style="flex: 2;">
         <div class="dashboard-card">
             <h3>Interactive Label Preview</h3>
             <p>Preview the label with selected headers:</p>
diff --git a/py_app/app/templates/label_templates.html b/py_app/app/templates/label_templates.html
index 846f0d3..0a167f4 100644
--- a/py_app/app/templates/label_templates.html
+++ b/py_app/app/templates/label_templates.html
@@ -3,29 +3,19 @@
 {% block title %}Label Templates{% endblock %}
 
 {% block content %}
-<div class="">
 <div class="card-container">
-    <h1>Manage Label Templates</h1>
-    <p>This page will allow users to manage and configure label templates.</p>
-
-    <!-- Card: List of Label Templates -->
-    <div class="dashboard-card">
+    <div class="card">
         <h3>List of Label Templates</h3>
-        <p>Below is the list of existing label templates:</p>
-        <ul id="template-list">
-            <!-- Example template items -->
-            <li>
-                <span>Template 1</span>
-                <button class="btn edit-btn">Edit</button>
-                <button class="btn delete-btn">Delete</button>
-            </li>
-            <li>
-                <span>Template 2</span>
+        <ul class="user-list">
+            {% for template in templates %}
+            <li data-template-id="{{ template.id }}">
+                <span class="template-name">{{ template.name }}</span>
                 <button class="btn edit-btn">Edit</button>
                 <button class="btn delete-btn">Delete</button>
             </li>
+            {% endfor %}
         </ul>
-        <button id="create-template-btn" class="btn">Create New Template</button>
+        <button id="create-template-btn" class="btn create-btn">Create New Template</button>
     </div>
 </div>
 {% endblock %}
\ No newline at end of file