diff --git a/pynyaata/templates/index.html.j2 b/pynyaata/templates/index.html.j2
index 8808ef4..88c1cd7 100644
--- a/pynyaata/templates/index.html.j2
+++ b/pynyaata/templates/index.html.j2
@@ -3,6 +3,20 @@
     <section class="hero is-fullheight-with-navbar">
         <div class="hero-body m-auto">
             <p class="title">{{ _("π😼た") }}</p>
+            <div class="subtitle">
+            <form action="{{ url_for('index') }}">
+                <div class="field has-addons">
+                    <div class="control">
+                        {{ search_form.q(placeholder=_("Search animes ..."), class="input", value=request.args.get("q", "")) }}
+                    </div>
+                    <div class="control">
+                        <button type="submit" class="button">
+                            <i class="fa fa-search"></i>
+                        </button>
+                    </div>
+                </div>
+            </form>
+            </div>
         </div>
     </section>
 {% endblock body %}
diff --git a/pynyaata/templates/layout.html.j2 b/pynyaata/templates/layout.html.j2
index b389add..5ee181d 100644
--- a/pynyaata/templates/layout.html.j2
+++ b/pynyaata/templates/layout.html.j2
@@ -32,11 +32,15 @@
             <div class="navbar-end">
                 {% if request.endpoint != "index" %}
                     <form action="{{ url_for('index') }}" class="navbar-item">
-                        <div class="control has-icons-right">
-                            {{ search_form.q(placeholder=_("Search animes ..."), class="input is-rounded", value=request.args.get("q", "")) }}
-                            <span class="icon is-small is-right">
-                                <i class="fa fa-search"></i>
-                            </span>
+                        <div class="field has-addons">
+                            <div class="control">
+                                {{ search_form.q(placeholder=_("Search animes ..."), class="input", value=request.args.get("q", "")) }}
+                            </div>
+                            <div class="control">
+                                <button type="submit" class="button">
+                                    <i class="fa fa-search"></i>
+                                </button>
+                            </div>
                         </div>
                     </form>
                 {% endif %}