diff --git a/Changes b/Changes
index ed744a2..a55fb58 100755
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+0.12 2015-01-28
+        - Fixed alignment bug.
+
 0.11 2014-01-16
         - Fixed paging bug with the async api.
         - Disabled Testing feature in tutorial.
diff --git a/lib/Korap.pm b/lib/Korap.pm
index 931fc2f..9346375 100644
--- a/lib/Korap.pm
+++ b/lib/Korap.pm
@@ -2,7 +2,7 @@
 use Mojo::Base 'Mojolicious';
 use Mojo::ByteStream 'b';
 
-our $VERSION = '0.11';
+our $VERSION = '0.12';
 
 # Start dev with
 # morbo -w lib -w templates -w public/sass -w public/js -w public/css script/korap
diff --git a/public/js/hint.js b/public/js/hint.js
index 5e14283..afa04e1 100644
--- a/public/js/hint.js
+++ b/public/js/hint.js
@@ -89,12 +89,12 @@
 
 var hintArray = {
   "-" : [
-    ["Connexor",   "cnx/"],
-    ["CoreNLP",    "corenlp/"],
-    ["Mate",       "mate/"],
-    ["OpenNLP",    "opennlp/"],
-    ["TreeTagger", "tt/"],
-    ["Xerox Parser", "xip/"]
+    ["Connexor",   "cnx/",     "Constituency, Lemma, Morphology, Part-of-Speech, Syntax"],
+    ["CoreNLP",    "corenlp/", "Named Entities"],
+    ["Mate",       "mate/",     "Lemma, Morphology, Part-of-Speech"],
+    ["OpenNLP",    "opennlp/", "Part-of-Speech"],
+    ["TreeTagger", "tt/",      "Lemma, Part-of-Speech"],
+    ["Xerox Parser", "xip/",   "Constituency, Lemma, Part-of-Speech"]
   ],
   "corenlp/" : [
     ["Named Entity", "ne=" , "Combined"],
diff --git a/public/js/src/hint.js b/public/js/src/hint.js
index 0b696d1..b5c2043 100644
--- a/public/js/src/hint.js
+++ b/public/js/src/hint.js
@@ -11,6 +11,17 @@
 // - Add help option that opens the tutorial, e.g. to the foundry
 // - http://en.wikipedia.org/wiki/JSDoc
 
+// The last entry types (foundry, foundry/layer) is remembered and chosen by default
+
+// Show the context at the top as breadcrumbs
+// Highlight the context in the query (probably)
+// Support backspace for removing the last prefix
+
+/*
+Alternative: Use right arrow for temporary context switch and arrow back
+for temporary context removal
+*/
+
 /**
  * The KorAP namespace for project related scripts
  * @namespace
diff --git a/public/sass/hint.scss b/public/sass/hint.scss
index d67553a..e5cb41b 100644
--- a/public/sass/hint.scss
+++ b/public/sass/hint.scss
@@ -36,6 +36,7 @@
     margin: 0;
     margin-top: -1px;
     text-indent: 0;
+    max-width: 23em;
     display: inline-block;
     background-color: $pagination-bg;
     border: {
diff --git a/t/basic.t b/t/basic.t
index c126a70..1b2419a 100644
--- a/t/basic.t
+++ b/t/basic.t
@@ -7,7 +7,6 @@
 $t->get_ok('/')
   ->status_is(200)
   ->text_is('title', 'KorAP')
-  ->text_like('h1 span', qr/Korpusanalyseplattform/i)
-  ;
+  ->text_like('h1 span', qr/Korpusanalyseplattform/i);
 
 done_testing();
diff --git a/t/remote.t b/t/remote.t
index 9de6fb9..8cbee3b 100644
--- a/t/remote.t
+++ b/t/remote.t
@@ -14,6 +14,7 @@
 $t->get_ok('/?q=test')
   ->text_is('pre.query.serial span', 'JSON-LD Serialization for "test"')
   ->text_like('#total-results', qr/\d+ matches$/)
+  ->element_exists('[title=Alignment]')
   ->text_is('#pagination a[rel=self] span', 1)
 ;