diff --git a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less
index 21be845..1b666eb 100644
--- a/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less
+++ b/invenio_theme_tugraz/assets/semantic-ui/less/invenio_theme_tugraz/overrides.less
@@ -135,4 +135,22 @@ border-radius: 0;
 .ui.form input[type=time], 
 .ui.form input[type=url] {
   border-radius: 0;
+}
+.ui.input>input {
+  border-radius: 0;
+}
+.ui.segment {
+  border-radius: 0;
+}
+.ui.selection.dropdown {
+  border-radius: 0;
+}
+.ui.card, .ui.cards>.card {
+  border-radius: 0;
+}
+.ui.action.input:not([class*="left action"])>.button:last-child, 
+.ui.action.input:not([class*="left action"])>.buttons:last-child>
+.button, .ui.action.input:not([class*="left action"])>
+.dropdown:last-child {
+  border-radius: 0;
 }
\ No newline at end of file
diff --git a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
index 9b75c83..cd0b6fb 100644
--- a/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
+++ b/invenio_theme_tugraz/templates/invenio_theme_tugraz/index.html
@@ -20,10 +20,10 @@
         {%- block frontpage_form %}
         <div class="ui center aligned grid">
           <div class="eight wide column">
-            <form action="/search" class="ui form">
-              <div class="ui fluid big action input">
-                <input type="text" name="q" autofocus="autofocus" class="form-control" placeholder="{{ _("Type and press enter to search") }}">
-                <button type="submit" class="ui icon search button"><i class="search icon"></i></button>
+            <form action="{{config.THEME_SEARCH_ENDPOINT}}" class="ui form" role="search">
+              <div class="ui fluid big action icon input">
+                <input type="text" name="q" autofocus="autofocus" placeholder="{{ _("Type and press enter to search") }}" style="border-radius: 0;">
+                <button type="submit" class="ui icon search button"><i class="icon search"></i></button>
               </div>
             </form>
           </div>
@@ -85,9 +85,9 @@
       {%- if not loop.last %}
       <div class="ui divider"></div>
       {%- else%}
-      <div class="ui center aligned grid">
+      <div class="ui right floated button">
         <div class="eight wide column">
-              <a href="{{url_for('invenio_search_ui.search')}}" class="ui right floated button">{{_('More')}}</a>
+              <a href="{{url_for('invenio_search_ui.search')}}">{{_('More')}}</a>
         </div>
       </div>
       {%- endif %}