diff --git a/app/views/layouts/_menu.php b/app/views/layouts/_menu.php
index ab8b930..4bde047 100755
--- a/app/views/layouts/_menu.php
+++ b/app/views/layouts/_menu.php
@@ -46,11 +46,7 @@
= $this->linkTo($this->t('.posts.upload'), ['controller' => 'post', 'action' => 'upload']) ?>
= $this->linkTo($this->t('.posts.random'), ['controller' => 'post', 'tags' => 'order:random']) ?>
= $this->linkTo($this->t('.posts.popular'), ['controller' => 'post', 'action' => 'popular_recent']) ?>
- = $this->linkTo($this->t('.posts.image_search'), ['controller' => 'post', 'action' => 'similar']) ?>
= $this->linkTo($this->t('.posts.history'), ['controller' => 'history', 'action' => 'index']) ?>
- is_contributor_or_higher()) : ?>
- = $this->linkTo($this->t('.posts.batch'), ['controller' => 'batch', 'action' => 'index']) ?>
-
is_janitor_or_higher()) : ?>
= $this->linkTo($this->t('.posts.moderate'), ['controller' => 'post', 'action' => 'moderate'], ['class' => 'moderate']) ?>
diff --git a/app/views/layouts/default.php b/app/views/layouts/default.php
index 12354d2..631b858 100755
--- a/app/views/layouts/default.php
+++ b/app/views/layouts/default.php
@@ -136,12 +136,15 @@ container
= $this->formTag('post#index', array('method' => 'get', 'accept-charset' => 'UTF-8'), function(){ ?>
- = $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '38', 'autocomplete' => 'off', 'placeholder' => 'Search', 'style' => 'font-size: 20pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: dotted; background: #2b0000;')) ?>
- submitTag($this->t('.search'), array('style' => 'display: none;', 'name' => '')) ?>
+ request()->controller() == 'post') : ?>
+ = $this->textFieldTag("tags", $this->h($this->params()->tags), array('size' => '36', 'autocomplete' => 'off', 'placeholder' => 'Search Posts...', 'style' => 'font-size: 20pt; padding: 0 0 1px 4px; margin: 4px 0 0 8px; border-style: dotted; background: #2b0000;')) ?>
+ = $this->tag_completion_box('$("tags")', ['$("tags").up("form")', '$("tags")', null], true) ?>
+
-= $this->tag_completion_box('$("tags")', ['$("tags").up("form")', '$("tags")', null], true) ?>
+
= $this->partial('layouts/menu') ?>
= $this->partial('layouts/login') ?>
diff --git a/app/views/post/index.php b/app/views/post/index.php
index 49f8dbc..cb4a375 100755
--- a/app/views/post/index.php
+++ b/app/views/post/index.php
@@ -26,7 +26,7 @@