diff --git a/cps/static/css/style.css b/cps/static/css/style.css
index 4b7e8b8b..48971ebe 100644
--- a/cps/static/css/style.css
+++ b/cps/static/css/style.css
@@ -31,3 +31,8 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te
 
 .btn-file {position: relative; overflow: hidden;}
 .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;}
+
+.btn-toolbar .btn { margin-bottom: 5px; }
+
+.btn-primary:hover, .btn-primary:focus, .btn-primary:active, .btn-primary.active, .open .dropdown-toggle.btn-primary{ background-color: #1C5484; }
+.btn-primary.disabled, .btn-primary[disabled], fieldset[disabled] .btn-primary, .btn-primary.disabled:hover, .btn-primary[disabled]:hover, fieldset[disabled] .btn-primary:hover, .btn-primary.disabled:focus, .btn-primary[disabled]:focus, fieldset[disabled] .btn-primary:focus, .btn-primary.disabled:active, .btn-primary[disabled]:active, fieldset[disabled] .btn-primary:active, .btn-primary.disabled.active, .btn-primary[disabled].active, fieldset[disabled] .btn-primary.active { background-color: #89B9E2; }
diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index d75061dd..85d71db0 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -57,9 +57,10 @@
                 <div class="form-group">
                   <input type="text" class="form-control" name="query" placeholder="Search">
                 </div>
-                <button type="submit" class="btn btn-default">Submit</button>
+                <button type="submit" class="btn btn-default">Go!</button>
               </form>
             </li>
+            <li><a href="{{url_for('advanced_search')}}"><span class="glyphicon glyphicon-search"></span> Advanced Search</a></li>
           </ul>
           <ul class="nav navbar-nav navbar-right" id="main-nav">
             {% if g.user.is_authenticated() %}
diff --git a/cps/web.py b/cps/web.py
index 374650d9..36dc82f6 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -318,6 +318,26 @@ def get_series_json():
         entries = db.session.execute("select name from series where name like '%" + query + "%'")
         json_dumps = json.dumps([dict(r) for r in entries])
         return json_dumps
+        
+@app.route("/get_matching_tags", methods = ['GET', 'POST'])
+@login_required_if_no_ano
+def get_matching_tags(): 
+    tag_dict = {'tags': []}
+    if request.method == "GET":
+        q = db.session.query(db.Books)
+        author_input = request.args.get('author_name')
+        title_input = request.args.get('book_title')
+        tag_inputs = request.args.getlist('tag')
+        q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_input + "%")), db.Books.title.like("%"+title_input+"%"))
+        if len(tag_inputs) > 0:
+            for tag in tag_inputs:
+                q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+        for book in q:
+            for tag in book.tags:
+                if tag.id not in tag_dict['tags']:
+                    tag_dict['tags'].append(tag.id)
+    json_dumps = json.dumps(tag_dict)
+    return json_dumps
 
 @app.route("/", defaults={'page': 1})
 @app.route('/page/<int:page>')
@@ -421,6 +441,25 @@ def search():
         return render_template('search.html', searchterm=term, entries=entries)
     else:
         return render_template('search.html', searchterm="")
+        
+@app.route("/advanced_search", methods=["GET"])
+@login_required_if_no_ano
+def advanced_search():
+    if request.method == 'GET':
+        print "GETTTTTTTTTTTT"
+        q = db.session.query(db.Books)
+        tag_inputs = request.args.getlist('tag')
+        author_name = request.args.get("author_name")
+        book_title = request.args.get("book_title")
+        if tag_inputs or author_name or book_title:
+            q = q.filter(db.Books.authors.any(db.Authors.name.like("%" +  author_name + "%")), db.Books.title.like("%"+book_title+"%"))
+            random = db.session.query(db.Books).order_by(func.random()).limit(config.RANDOM_BOOKS)
+            for tag in tag_inputs:
+                q = q.filter(db.Books.tags.any(db.Tags.id == tag))
+            q = q.all()
+            return render_template('search.html', searchterm="tags", entries=q)
+    tags = db.session.query(db.Tags).order_by(db.Tags.name).all()
+    return render_template('search_form.html', tags=tags)
 
 @app.route("/author")
 @login_required_if_no_ano