diff --git a/.travis.yml b/.travis.yml
index 7db5af85..cf7ef23a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,11 +1,13 @@
 sudo: required
 language: python
+group: deprecated-2017Q4
 python:
     - "2.7"
 env:
     - CKANVERSION=2.5.6 POSTGISVERSION=2
     - CKANVERSION=2.6.3 POSTGISVERSION=2
     - CKANVERSION=2.7.0 POSTGISVERSION=2
+    - CKANVERSION=2.8.1 POSTGISVERSION=2
 services:
     - redis-server
     - postgresql
diff --git a/README.md b/README.md
index 788fc419..ce42effb 100644
--- a/README.md
+++ b/README.md
@@ -248,6 +248,11 @@ python setup.py nosetests
 
 ## Changelog
 
+### v1.1.0
+
+* New: Compatibility with CKAN 2.8.0
+* New: Somali translation (thanks to @SimuliChina)
+
 ### v1.0.0
 
 * New: Option to follow data requests.
@@ -270,7 +275,7 @@ python setup.py nosetests
 
 ### v0.4.1
 
-* New: Brazilian Portuguese (thanks to @allysonbarros)
+* New: Brazilian Portuguese translation (thanks to @allysonbarros)
 
 ### v0.4.0
 
diff --git a/ckanext/datarequests/controllers/ui_controller.py b/ckanext/datarequests/controllers/ui_controller.py
index b3675de5..71419256 100644
--- a/ckanext/datarequests/controllers/ui_controller.py
+++ b/ckanext/datarequests/controllers/ui_controller.py
@@ -149,7 +149,7 @@ def pager_url(state=None, sort=None, q=None, page=None):
             if include_organization_facet is True:
                 c.facet_titles['organization'] = tk._('Organizations')
 
-            return tk.render(file_to_render)
+            return tk.render(file_to_render, extra_vars={'user_dict': c.user_dict if hasattr(c, 'user_dict') else None, 'group_type': 'organization'})
         except ValueError as e:
             # This exception should only occur if the page value is not valid
             log.warn(e)
diff --git a/ckanext/datarequests/i18n/pt_BR/LC_MESSAGES/ckanext-datarequests.mo b/ckanext/datarequests/i18n/pt_BR/LC_MESSAGES/ckanext-datarequests.mo
index 1046f26f..c8e42285 100644
Binary files a/ckanext/datarequests/i18n/pt_BR/LC_MESSAGES/ckanext-datarequests.mo and b/ckanext/datarequests/i18n/pt_BR/LC_MESSAGES/ckanext-datarequests.mo differ
diff --git a/ckanext/datarequests/i18n/so/LC_MESSAGES/ckanext-datarequests.po b/ckanext/datarequests/i18n/so/LC_MESSAGES/ckanext-datarequests.po
new file mode 100644
index 00000000..3cd41cd7
--- /dev/null
+++ b/ckanext/datarequests/i18n/so/LC_MESSAGES/ckanext-datarequests.po
@@ -0,0 +1,503 @@
+# Somali translations for ckanext-datarequests.
+# Copyright (C) 2016 ORGANIZATION
+# This file is distributed under the same license as the
+# ckanext-datarequests
+# project.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2016.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: ckanext-datarequests 0.3.1\n"
+"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
+"POT-Creation-Date: 2016-04-28 14:45+0200\n"
+"PO-Revision-Date: 2018-02-02 16:05+0300\n"
+"Last-Translator: DATASCIENCE LTD info@datascience.co.ke\n"
+"Language: so\n"
+"Language-Team: so <LL@li.org>\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.3.4\n"
+
+#: ckanext/datarequests/actions.py:192 ckanext/datarequests/actions.py:244
+#: ckanext/datarequests/actions.py:435 ckanext/datarequests/actions.py:480
+#: ckanext/datarequests/actions.py:536 ckanext/datarequests/actions.py:624
+msgid "Data Request ID has not been included"
+msgstr "Aqoonsiga Codsiyada macluumaadka laguma soo darin"
+
+#: ckanext/datarequests/actions.py:203 ckanext/datarequests/actions.py:255
+#: ckanext/datarequests/actions.py:446 ckanext/datarequests/actions.py:491
+#, python-format
+msgid "Data Request %s not found in the data base"
+msgstr "Codsiga xokta %s aan laga helin diiwaanka"
+
+#: ckanext/datarequests/actions.py:500
+msgid "This Data Request is already closed"
+msgstr "Codsigan xoktani hore ayaa loo xiray"
+
+#: ckanext/datarequests/actions.py:578 ckanext/datarequests/actions.py:671
+#: ckanext/datarequests/actions.py:717
+msgid "Comment ID has not been included"
+msgstr "Aqoonsiga faallooyinka lama soo darin"
+
+#: ckanext/datarequests/actions.py:589 ckanext/datarequests/actions.py:682
+#: ckanext/datarequests/actions.py:728
+#, python-format
+msgid "Comment %s not found in the data base"
+msgstr "Faallooyinka %s lagama helin saldhigga xogta"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+#: ckanext/datarequests/validator.py:31 ckanext/datarequests/validator.py:34
+#: ckanext/datarequests/validator.py:41
+msgid "Title"
+msgstr "Ciwaan"
+
+#: ckanext/datarequests/validator.py:31
+#, python-format
+msgid "Title must be a maximum of %d characters long"
+msgstr "Cinwaanka waa inuu ahaado ugu badnaan %d tiro ahaan"
+
+#: ckanext/datarequests/validator.py:34
+msgid "Title cannot be empty"
+msgstr "Ciwaaku ma noqon karo mid madhan"
+
+#: ckanext/datarequests/validator.py:41
+msgid "That title is already in use"
+msgstr "Ciwaakani waala isticmaalayaa"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+#: ckanext/datarequests/validator.py:45
+msgid "Description"
+msgstr "Sharaxaad"
+
+#: ckanext/datarequests/validator.py:45
+#, python-format
+msgid "Description must be a maximum of %d characters long"
+msgstr "Sharaxaadu waa inay ahaataa ugu badnaan %d ka tiro ayaah"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:25
+#: ckanext/datarequests/validator.py:52
+msgid "Organization"
+msgstr "Hay’ad"
+
+#: ckanext/datarequests/validator.py:52
+msgid "Organization is not valid"
+msgstr "Hay’adu ansax ma’aha"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:24
+#: ckanext/datarequests/validator.py:65
+msgid "Accepted Dataset"
+msgstr "Xokta la oggolaaday"
+
+#: ckanext/datarequests/validator.py:65
+msgid "Dataset not found"
+msgstr "Xokta aan lahelin"
+
+#: ckanext/datarequests/templates/datarequests/base.html:17
+#: ckanext/datarequests/templates/datarequests/show.html:25
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request"
+msgstr "Codsashada xokta"
+
+#: ckanext/datarequests/validator.py:75
+msgid "Data Request not found"
+msgstr "Xokta la codsaday lama helin"
+
+#: ckanext/datarequests/validator.py:78 ckanext/datarequests/validator.py:81
+msgid "Comment"
+msgstr "Faallo"
+
+#: ckanext/datarequests/validator.py:78
+msgid "Comments must be a minimum of 1 character long"
+msgstr "Faalooyinka waa iney ahaataa oogu yaraan 1 dabaqat oo dheer"
+
+#: ckanext/datarequests/validator.py:81
+#, python-format
+msgid "Comments must be a maximum of %d characters long"
+msgstr "Faalooyinka waa inay ahaataa ugu badnaan %d dabaq oo dheer"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Newest"
+msgstr "Oogu dambeeyay/cusub"
+
+#: ckanext/datarequests/controllers/ui_controller.py:129
+msgid "Oldest"
+msgstr "Oogu da’da weyn/oogu horeeyay"
+
+#: ckanext/datarequests/controllers/ui_controller.py:145
+#: ckanext/datarequests/tests/test_ui_controller.py:628
+msgid "State"
+msgstr "Gobol"
+
+#: ckanext/datarequests/controllers/ui_controller.py:150
+#: ckanext/datarequests/templates/header.html:6
+#: ckanext/datarequests/tests/test_ui_controller.py:630
+msgid "Organizations"
+msgstr "Hay’ado"
+
+#: ckanext/datarequests/controllers/ui_controller.py:156
+msgid "\"page\" parameter must be an integer"
+msgstr "Calaamadaha boga waa inuu noqdaa mid isku dhafan"
+
+#: ckanext/datarequests/controllers/ui_controller.py:159
+msgid "Unauthorized to list Data Requests"
+msgstr "Aan la fasaxin in lagu qoro codsiga xogta"
+
+#: ckanext/datarequests/controllers/ui_controller.py:210
+msgid "Unauthorized to create a Data Request"
+msgstr "Aan loo ogolaan in la sameeyo codsi xoggeed"
+
+#: ckanext/datarequests/controllers/ui_controller.py:225
+#: ckanext/datarequests/controllers/ui_controller.py:248
+#: ckanext/datarequests/controllers/ui_controller.py:265
+#: ckanext/datarequests/controllers/ui_controller.py:334
+#: ckanext/datarequests/controllers/ui_controller.py:401
+#, python-format
+msgid "Data Request %s not found"
+msgstr "Xog codsiyeed %s aan la helin"
+
+#: ckanext/datarequests/controllers/ui_controller.py:228
+#, python-format
+msgid "You are not authorized to view the Data Request %s"
+msgstr "Laguuma ogala inaad aragto codsiga xogta %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:251
+#, python-format
+msgid "You are not authorized to update the Data Request %s"
+msgstr "Laguuma ogola inaad cusboonaysiisi codsiga xogta %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:261
+#: ckanext/datarequests/tests/test_ui_controller.py:672
+#, python-format
+msgid "Data Request %s has been deleted"
+msgstr "Xogta la codsaday %s waa la tirtiray"
+
+#: ckanext/datarequests/controllers/ui_controller.py:268
+#, python-format
+msgid "You are not authorized to delete the Data Request %s"
+msgstr "Laguuma ogola in aad tirtirto xogta la codsaday %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:316
+msgid "This data request is already closed"
+msgstr "Xogtan la codsaday wey xirantahay"
+
+#: ckanext/datarequests/controllers/ui_controller.py:337
+#, python-format
+msgid "You are not authorized to close the Data Request %s"
+msgstr "Laguuma ogola in aad xidho codsiga xogtani %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:366
+msgid "Comment has been published"
+msgstr "Faallo ayaa la daabacay"
+
+#: ckanext/datarequests/controllers/ui_controller.py:368
+msgid "Comment has been updated"
+msgstr "Faallo ayaa la cusbooneysiiyey"
+
+#: ckanext/datarequests/controllers/ui_controller.py:374
+#, python-format
+msgid "You are not authorized to %s"
+msgstr "Laguma ogola %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:405
+#, python-format
+msgid "You are not authorized to list the comments of the Data Request %s"
+msgstr "Laguuma ogola in aad qorto faallooyinka codsiga xogta %s"
+
+#: ckanext/datarequests/controllers/ui_controller.py:414
+msgid "Comment has been deleted"
+msgstr "Faallada waa la tirtirey"
+
+#: ckanext/datarequests/controllers/ui_controller.py:419
+#, python-format
+msgid "Comment %s not found"
+msgstr "Faallada %s lama helin"
+
+#: ckanext/datarequests/controllers/ui_controller.py:422
+msgid "You are not authorized to delete this comment"
+msgstr "Laguuma ogolaan in aad faalladan tirtirto"
+
+#: ckanext/datarequests/templates/header.html:5
+#: ckanext/datarequests/templates/organization/read_base.html:4
+#: ckanext/datarequests/templates/user/read_base.html:4
+msgid "Datasets"
+msgstr "Bandhig xogeed"
+
+#: ckanext/datarequests/templates/header.html:7
+msgid "Groups"
+msgstr "Kooxo"
+
+#: ckanext/datarequests/templates/datarequests/base.html:8
+#: ckanext/datarequests/templates/datarequests/base.html:11
+#: ckanext/datarequests/templates/datarequests/close.html:6
+#: ckanext/datarequests/templates/datarequests/edit.html:6
+#: ckanext/datarequests/templates/datarequests/new.html:6
+#: ckanext/datarequests/templates/datarequests/show.html:8
+#: ckanext/datarequests/templates/header.html:8
+#: ckanext/datarequests/templates/organization/read_base.html:6
+#: ckanext/datarequests/templates/user/read_base.html:6
+msgid "Data Requests"
+msgstr "Xog codsiyeed"
+
+#: ckanext/datarequests/templates/header.html:9
+#: ckanext/datarequests/templates/organization/read_base.html:7
+msgid "About"
+msgstr "Kusaabsan"
+
+#: ckanext/datarequests/templates/datarequests/base.html:20
+msgid ""
+"Data Requests allow users to ask for data that is not published in the "
+"platform yet. If you want some specific data and you are not able to find"
+" it among all the published datasets, you can create a new data request "
+"specifying the data than you want to get."
+msgstr ""
+"Codsiyada xogta waxay u oggolaanaysaa dadka isticmaala inay codsadaan xog"
+" aan weli lagu daabicin goobta. Hadii aad dooneyso xog gaar ah aadana ka "
+"heli karin xog bandhigeydyada daabacan, waxaad abuuri kartaa codsi cusub "
+"oo xogta aad rabto inaad hesho"
+
+#: ckanext/datarequests/templates/datarequests/close.html:3
+#: ckanext/datarequests/templates/datarequests/close.html:8
+#: ckanext/datarequests/templates/datarequests/close.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:25
+msgid "Close Data Request"
+msgstr "Xidh codsiga xogtan"
+
+#: ckanext/datarequests/templates/datarequests/comment.html:5
+#: ckanext/datarequests/templates/datarequests/show.html:28
+msgid "Comments"
+msgstr "Faallooyin"
+
+#: ckanext/datarequests/templates/datarequests/edit.html:3
+#: ckanext/datarequests/templates/datarequests/edit.html:8
+#: ckanext/datarequests/templates/datarequests/edit.html:12
+msgid "Edit Data Request"
+msgstr "Kale habee codsiga xogta"
+
+#: ckanext/datarequests/templates/datarequests/index.html:9
+#: ckanext/datarequests/templates/organization/datarequests.html:10
+msgid "Add Data Request"
+msgstr "Ku dar codsi xoggeed"
+
+#: ckanext/datarequests/templates/datarequests/index.html:12
+#: ckanext/datarequests/templates/organization/datarequests.html:13
+#: ckanext/datarequests/templates/user/datarequests.html:9
+msgid "Search Data Requests..."
+msgstr "Raadinta xog codsiyeed"
+
+#: ckanext/datarequests/templates/datarequests/new.html:3
+#: ckanext/datarequests/templates/datarequests/new.html:7
+#: ckanext/datarequests/templates/datarequests/new.html:11
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:47
+#: ckanext/datarequests/templates/datarequests/snippets/new_datarequest_form.html:7
+msgid "Create Data Request"
+msgstr "Abuurida xog codsiyeed"
+
+#: ckanext/datarequests/templates/datarequests/new.html:16
+msgid ""
+"To create a data request, fill the form and specify a title and a "
+"description for your request. Please, be as clear as you can in order to "
+"ease the task of accomplishing your request. You can also specify an "
+"organization if your data request is closely related with it. "
+msgstr ""
+"Si loo abuuro codsiyada xogta,buuxi foomka oo sheeg tilmaamaha iyo "
+"sharaxaada codsigaaga. Fadlan u cadee sida oogu fudud si howsha aad "
+"codsaneyso u fududaato, waxaad sidoo kale shiigi kartaa magac urur ama "
+"hay’ad u dhow xogta aad raadineyso"
+
+#: ckanext/datarequests/templates/datarequests/show.html:15
+msgid "Manage"
+msgstr "Maamul"
+
+#: ckanext/datarequests/templates/datarequests/show.html:19
+msgid "Close"
+msgstr "Xirit"
+
+#: ckanext/datarequests/templates/datarequests/show.html:45
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:19
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:12
+msgid "Closed"
+msgstr "La xidh"
+
+#: ckanext/datarequests/templates/datarequests/show.html:50
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html:16
+msgid "Open"
+msgstr "Fur"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:2
+msgid "Additional Info"
+msgstr "Xog dheeraad ah"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:7
+msgid "Creator"
+msgstr "Abuure"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:8
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:12
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:29
+msgid "None"
+msgstr "Midna"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:15
+msgid "Created"
+msgstr "Abuuray"
+
+#: ckanext/datarequests/templates/datarequests/snippets/additional_info.html:20
+msgid "Not closed yet"
+msgstr "Wali ma xidhna"
+
+#: ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html:11
+msgid "Accep. Dataset"
+msgstr "Xog bandhigeed la aqbalay"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:22
+msgid "Add a new Comment"
+msgstr "Ku dar faallo cusub"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:23
+#, python-format
+msgid ""
+"You can use <a href=\"#markdown\" title=\"Markdown quick reference\" "
+"data-target=\"popover\" data-content=\"%(markdown_tooltip)s\" data-"
+"html=\"true\">Markdown formatting</a> here. You can refer datasets by "
+"adding their URL."
+msgstr "Waxaad isticmaali kartaa<a href=\"#markdown\" title=\"Markdown si dhakhso ah u tixraac\" "
+"data-target=\"popover\" data-content=\"%(markdown_tooltip)s\" data-"
+"html=\"true\">Markdown qaabaynta</a> halkan. Waxaad u gudbin kartaa xog-bandhigeed"
+"iyagoo raacinaya URL-yadooda"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:28
+msgid "Cancel"
+msgstr "Ka noqosho"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:29
+msgid "Update Comment"
+msgstr "Cusbooneysii faallooyin"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_form.html:31
+msgid "Add Comment"
+msgstr "Ku dar faallo"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:18
+msgid "Are you sure you want to delete this comment?"
+msgstr "Ma hubtaa oo ma waxaan dooneysaa in aad tirtirto faaladan?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comment_item.html:29
+msgid "commented"
+msgstr "ka faallooday"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:3
+msgid "Current Discussion"
+msgstr "Wada hadalka hada"
+
+#: ckanext/datarequests/templates/datarequests/snippets/comments.html:13
+msgid "This data request has not been commented yet"
+msgstr "Xog codsiyeedkani lagama faalloon wali"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:17
+msgid "eg. Data Request Name"
+msgstr "Tusaale magaca xog codsiyeedka"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:21
+msgid "eg. Data Request description"
+msgstr "Tusaale faahfaahinta xog codsiyeedka"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:29
+msgid "No organization"
+msgstr "Ma jiro urur"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:43
+msgid "Are you sure you want to delete this data request?"
+msgstr "Ma hubtaa oo ma waxaan dooneysaa in aad tirtirto xog codsiyeedkan"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html:44
+msgid "Delete"
+msgstr "Tirtir"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:1
+msgid "No Data Requests found"
+msgstr "Wax la helay oo xog codsiyeed ah majiraan"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:14
+msgid "No Data Requests found with the given criteria"
+msgstr "Shuruudaha labixiyay laguma helin xog codsiyeed"
+
+#: ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html:16
+msgid "How about creating one?"
+msgstr "Sidee loo abuuraa mid?"
+
+#: ckanext/datarequests/templates/datarequests/snippets/edit_datarequest_form.html:4
+msgid "Update Data Request"
+msgstr "Cusbooneysii xog codsiyeed"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:5
+msgid "{0} statistics"
+msgstr "{0} tirakoob"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "dataset"
+msgstr "xog bandhigeed"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:10
+msgid "datasets"
+msgstr "xog bandhigeedyo"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organization"
+msgstr "hay’ad"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:16
+msgid "organizations"
+msgstr "hay’addo"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "group"
+msgstr "koox"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:22
+msgid "groups"
+msgstr "kooxo"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related item"
+msgstr "shey la xiriiro"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:28
+msgid "related items"
+msgstr "waxyaabaha la xiriiro"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data request"
+msgstr "xog codsiyeed"
+
+#: ckanext/datarequests/templates/home/snippets/stats.html:34
+msgid "data requests"
+msgstr "xog codsiyeydyo"
+
+#: ckanext/datarequests/templates/organization/read_base.html:5
+#: ckanext/datarequests/templates/user/read_base.html:5
+msgid "Activity Stream"
+msgstr "Socodka hawlaha"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:6
+msgid "{number} data request found for \"{query}\""
+msgid_plural "{number} data requests found for \"{query}\""
+msgstr[0] "{number} xog codsiyeedka la helay  \"{query}\""
+msgstr[1] "{number} xog codsiyeedyo la helay \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:7
+msgid "No data requests found for \"{query}\""
+msgstr "Wax xoggag codsiyeed ah lama helin \"{query}\""
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:8
+msgid "{number} data request found"
+msgid_plural "{number} data requests found"
+msgstr[0] "{number} xog codsiyeed lahelay"
+msgstr[1] "{number} xoggag codsiyeed la helay"
+
+#: ckanext/datarequests/templates/snippets/custom_search_form.html:9
+msgid "No data requests found"
+msgstr "Lama helin wax xoggag codsiyeed ah"
+
diff --git a/ckanext/datarequests/public/datarequests.css b/ckanext/datarequests/public/datarequests.css
index 9b394365..f1802a03 100644
--- a/ckanext/datarequests/public/datarequests.css
+++ b/ckanext/datarequests/public/datarequests.css
@@ -1,9 +1,15 @@
+.fa {
+   width: auto;
+}
+
 .label-open {
     background-color: #2db55d;
+    margin-right: 10px;
 }
 
 .label-closed {
     background-color: #e0051e;
+    margin-right: 10px;
 }
 
 .uppercase {
@@ -126,4 +132,9 @@
 .comment-new {
   border-top: 2px solid #f3f3f3;
   background-color: #fff;
+}
+
+#comment-form .control-full,
+.comment-edit-form .control-full {
+    margin-bottom: 20px;
 }
\ No newline at end of file
diff --git a/ckanext/datarequests/templates/datarequests/show.html b/ckanext/datarequests/templates/datarequests/show.html
index 335976ef..89b11f87 100644
--- a/ckanext/datarequests/templates/datarequests/show.html
+++ b/ckanext/datarequests/templates/datarequests/show.html
@@ -12,7 +12,7 @@
 {% block content_action %}
 
   {% if h.check_access('update_datarequest', {'id':datarequest_id }) %}
-    {% link_for _('Manage'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='update', id=datarequest_id, class_='btn', icon='wrench' %}
+    {% link_for _('Manage'), controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='update', id=datarequest_id, class_='btn btn-default', icon='wrench' %}
   {% endif %}
 
   {% if h.check_access('close_datarequest', {'id':datarequest_id }) and not c.datarequest.closed %}
diff --git a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
index 0308cb07..06cd5f80 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/close_datarequest_form.html
@@ -1,13 +1,14 @@
 {% import 'macros/form.html' as form %}
+{% set form_horizontal = 'form-horizontal' if h.ckan_version()[:3] <= '2.7' else '' %}
 
-<form class="dataset-form form-horizontal" method="post" data-module="basic-form" action enctype="multipart/form-data">
+<form class="dataset-form {{ form_horizontal }}" method="post" data-module="basic-form" action enctype="multipart/form-data">
 
   {% block errors %}{{ form.errors(errors_summary) }}{% endblock %}
 
   <input type="hidden" id="id" name="id" value="{{ datarequest.get('id', '') }}" />
 
   {% block package_basic_fields_tags %}
-    <div class="control-group control-full">
+    <div class="control-group control-full form-group">
       <label class="control-label" for="field-accepted_dataset_id">{{ _("Accep. Dataset") }}</label>
       <div class="controls">
         <select id="field-accepted_dataset_id" name="accepted_dataset_id" data-module="autocomplete">
diff --git a/ckanext/datarequests/templates/datarequests/snippets/comment_form.html b/ckanext/datarequests/templates/datarequests/snippets/comment_form.html
index 44133920..ee1448cd 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/comment_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/comment_form.html
@@ -19,16 +19,16 @@
 
   <div class="control-full control-large control-group {{ 'error' if errors and errors.get('Comment') and focus }} editor">
     {% set markdown_tooltip = "<pre><p>__Bold text__ or _italic text_</p><p># title<br>## secondary title<br>### etc</p><p>* list<br>* of<br>* items</p><p>http://auto.link.ed/</p></pre><p><b><a href='http://daringfireball.net/projects/markdown/syntax' target='_blank'>Full markdown syntax</a></b></p><p class='muted'><b>Please note:</b> HTML tags are stripped out for security reasons</p>" %} 
-    <textarea name="comment" cols="20" rows="3" placeholder="{{ _('Add a new Comment') if not comment_id }}">{{ initial_text }}</textarea>
+    <textarea class="form-control" name="comment" cols="20" rows="3" placeholder="{{ _('Add a new Comment') if not comment_id }}">{{ initial_text }}</textarea>
     <span class="editor-info-block">{% trans %}You can use <a href="#markdown" title="Markdown quick reference" data-target="popover" data-content="{{ markdown_tooltip }}" data-html="true">Markdown formatting</a> here. You can refer datasets by adding their URL.{% endtrans %}</span>
   </div>
 
   <div class="comment-form-actions">
     {% if comment_id %}
       <button id="comment-discard-{{ comment_id }}" class="btn btn-danger" name="discard">{{ _('Cancel') }}</button>
-      <button class="btn" type="submit" name="update">{{ _('Update Comment') }}</button>
+      <button class="btn btn-primary" type="submit" name="update">{{ _('Update Comment') }}</button>
     {% else %}
-      <button class="btn" type="submit" name="add">{{ _('Add Comment') }}</button>
+      <button class="btn btn-primary" type="submit" name="add">{{ _('Add Comment') }}</button>
     {% endif %}
   </div>
 
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
index 90f38c7c..e8e53354 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_form.html
@@ -4,10 +4,11 @@
 {% set description = data.get('description', '') %}
 {% set organization_id = data.get('organization_id', h.get_request_param('organization')) %}
 {% set organizations_available = h.organizations_available('read') %}
+{% set form_horizontal = 'form-horizontal' if h.ckan_version()[:3] <= '2.7' else '' %}
 
 {# This provides a full page that renders a form for publishing a dataset. It can
 then itself be extended to add/remove blocks of functionality. #}
-<form class="dataset-form form-horizontal" method="post" data-module="basic-form" action enctype="multipart/form-data">
+<form class="dataset-form {{ form_horizontal }}" method="post" data-module="basic-form" action enctype="multipart/form-data">
 
   <input type="hidden" id="id" name="id" value="{{ data.get('id', '') }}" />
 
@@ -21,7 +22,7 @@
     {{ form.markdown('description', id='field-description', label=_('Description'), placeholder=_('eg. Data Request description'), value=description, error=errors['Description']) }}
   {% endblock %}
 
-  <div class="control-group">
+  <div class="control-group form-group">
     <label for="field-organizations" class="control-label">{{ _('Organization') }}</label>
     <div class="controls">
       <select id="field-organizations" name="organization_id" data-module="autocomplete">
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
index 45831723..773b28d7 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_item.html
@@ -23,7 +23,7 @@ <h3 class="dataset-heading">
       {% endif %}
       <div class="datarequest-properties">
         {% if h.show_comments_tab() %}
-          <a href="{{ h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest.get('id','')) }}" class="label"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
+          <a href="{{ h.url_for(controller='ckanext.datarequests.controllers.ui_controller:DataRequestsUI', action='comment', id=datarequest.get('id','')) }}" class="label label-default"><i class="icon-comment fa fa-comment"></i> {{ h.get_comments_number(datarequest.get('id', '')) }}</span></a>
         {% endif %}
         <div class="divider"/>
         <span class="date-datarequests">{{ h.time_ago_from_timestamp(datarequest.open_time) }}</span>
diff --git a/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html b/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html
index fe4b6641..2c14adfb 100644
--- a/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html
+++ b/ckanext/datarequests/templates/datarequests/snippets/datarequest_list.html
@@ -4,7 +4,7 @@
 
 {% block datarequest_search_results_list %}
   {% if datarequests %}
-    <ul class="dataset-list unstyled">
+    <ul class="dataset-list unstyled list-unstyled">
       {% for datarequest in datarequests %}
         {{ h.snippet('datarequests/snippets/datarequest_item.html', datarequest=datarequest, facet_titles=facet_titles) }}
       {% endfor %}
diff --git a/ckanext/datarequests/templates/user/read_base.html b/ckanext/datarequests/templates/user/read_base.html
index a40b2e03..6fee95a8 100644
--- a/ckanext/datarequests/templates/user/read_base.html
+++ b/ckanext/datarequests/templates/user/read_base.html
@@ -1,7 +1,10 @@
 {% ckan_extends %}
 
 {% block content_primary_nav %}
-  {{ h.build_nav_icon('user_datasets', _('Datasets'), id=user.name) }}
-  {{ h.build_nav_icon('user_activity_stream', _('Activity Stream'), id=user.name) }}
+  {% set user_datasets_nav = 'user_datasets' if h.ckan_version()[:3] <= '2.7' else 'user.read' %}
+  {% set user_activity_nav = 'user_activity_stream' if h.ckan_version()[:3] <= '2.7' else 'user.activity' %}
+
+  {{ h.build_nav_icon(user_datasets_nav, _('Datasets'), id=user.name) }}
+  {{ h.build_nav_icon(user_activity_nav, _('Activity Stream'), id=user.name) }}
   {{ h.build_nav_icon('user_datarequests', _('Data Requests'), id=user.name) }}
 {% endblock %}
diff --git a/ckanext/datarequests/tests/test_selenium.py b/ckanext/datarequests/tests/test_selenium.py
index 68d7034c..83f5cd80 100644
--- a/ckanext/datarequests/tests/test_selenium.py
+++ b/ckanext/datarequests/tests/test_selenium.py
@@ -119,7 +119,9 @@ def register(self, username, fullname, mail, password):
         self.logout()
 
     def default_register(self, user):
-        self.register(user, user, '%s@conwet.com' % user, user)
+        pwd = user.ljust(8, '0')
+        self.register(user, user, '%s@conwet.com' % user, pwd)
+        return pwd
 
     def login(self, username, password):
         driver = self.driver
@@ -183,7 +185,7 @@ def complete_datarequest_form(self, title, description, organization_name=None):
         driver.find_element_by_id('field-description').send_keys(description)
 
         if organization_name:
-            Select(driver.find_element_by_id('field-organizations')).select_by_visible_text(organization_name)
+            Select(driver.find_element_by_xpath('//*[@id="field-organizations"]')).select_by_visible_text(organization_name)
 
         driver.find_element_by_name('save').click()
 
@@ -219,7 +221,7 @@ def close_datarequest(self, datarequest_id, dataset_name=None):
         driver.find_element_by_link_text('Close').click()
 
         if dataset_name:
-            Select(driver.find_element_by_id('field-accepted_dataset_id')).select_by_visible_text(dataset_name)
+            Select(driver.find_element_by_xpath('//*[@id="field-accepted_dataset_id"]')).select_by_visible_text(dataset_name)
 
         driver.find_element_by_name('close').click()
 
@@ -256,7 +258,7 @@ def check_datarequests_counter(self, n_datarequests, search=None):
         if search:
             text += ' for "%s"' % search
 
-        self.assertEqual(text, self.driver.find_element_by_css_selector("h2").text)
+        self.assertEqual(text, self.driver.find_element_by_css_selector(".primary h2").text)
 
     def check_n_datarequests(self, expected_number):
         self.assertEqual(len(self.driver.find_elements_by_xpath(
@@ -304,14 +306,15 @@ def check_element_optically_displayed(self, element):
     def test_create_datarequest_and_check_permissions(self):
 
         users = ['user1', 'user2']
+        pwds = []
 
         # Create users
         for user in users:
-            self.default_register(user)
+            pwds.append(self.default_register(user))
 
         # The first user creates a data request and they are able to
         # close/modify it
-        self.login(users[0], users[0])
+        self.login(users[0], pwds[0])
         datarequest_title = 'Data Request 1'
         datarequest_description = 'Example Description'
         datarequest_id = self.create_datarequest(datarequest_title,
@@ -322,7 +325,7 @@ def test_create_datarequest_and_check_permissions(self):
         # Second user can access the data request but they are not able to
         # close/modify it
         self.logout()
-        self.login(users[1], users[1])
+        self.login(users[1], pwds[1])
         self.check_datarequest(datarequest_id, datarequest_title,
                                datarequest_description, True, False)
 
@@ -341,8 +344,8 @@ def test_create_invalid_datarequest(self, title, description_length, expected_er
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create the description
         description = _generate_random_string(description_length)
@@ -355,8 +358,8 @@ def test_create_datarequest_same_name(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create the comment
         title = 'Data Request'
@@ -378,8 +381,8 @@ def test_update_datarequest(self, new_title, new_description_length, expected_er
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create the data request
         datarequest_title = 'Data Request 1'
@@ -403,8 +406,8 @@ def test_update_datarequest_same_name(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create the comment
         title = 'Data Request'
@@ -424,8 +427,8 @@ def test_delete_datarequest(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create the data request
         datarequest_title = 'Data Request 1'
@@ -438,7 +441,7 @@ def test_delete_datarequest(self):
 
         # Check that there are not more data requests in the system
         self.assertTrue('No Data Requests found with the given criteria.'
-                        in self.driver.find_element_by_css_selector('p.empty').text)
+                        in self.driver.find_element_by_css_selector('.primary p.empty').text)
 
         # Check flash message
         self.assertTrue('Data Request ' + datarequest_title + ' has been deleted'
@@ -448,8 +451,8 @@ def test_close_datarequest(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create data request
         datarequest_title = 'Data Request 1'
@@ -464,12 +467,14 @@ def test_close_datarequest(self):
         self.check_datarequest(datarequest_id, datarequest_title,
                                datarequest_description, False, True)
 
+    @unittest.skipIf('.'.join(os.environ.get('CKANVERSION', '2.7').split('.')[:-1]) >= 2.8, 
+                     'This test cannot be run in CKAN >= 2.8 because elements in combo boxes cannot be selected')
     def test_close_datarequest_with_organization_and_accepted_dataset(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         organization_1_name = 'conwet'
         organization_2_name = 'upm'
@@ -518,8 +523,8 @@ def _check_pages(last_available):
         n_datarequests = 11
         base_name = 'Data Request'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         for i in range(n_datarequests):
             datarequest_title = '{0} {1}'.format(base_name, i)
@@ -573,7 +578,7 @@ def _check_pages(last_available):
 
         # Filter by open (there should be 5 data requests open with the given
         # base name)
-        self.driver.find_element_by_link_text('Open (5)').click()
+        self.driver.find_element_by_partial_link_text('Open').click()
         self.check_n_datarequests(5)
         self.check_datarequests_counter(5, base_name)
 
@@ -587,13 +592,14 @@ def _check_is_editable(editable):
             self.assertEqual(editable, self.is_element_present(By.CSS_SELECTOR, 'i.fa-times'))
 
         users = ['user1', 'user2']
+        pwds = []
 
         # Create users
         for user in users:
-            self.default_register(user)
+            pwds.append(self.default_register(user))
 
         # First user creates the data request
-        self.login(users[0], users[0])
+        self.login(users[0], pwds[0])
         datarequest_title = 'Data Request 1'
         datarequest_description = 'Example Description'
         datarequest_id = self.create_datarequest(datarequest_title,
@@ -601,7 +607,7 @@ def _check_is_editable(editable):
 
         # Second user creates the comment so they are able to modify it
         self.logout()
-        self.login(users[1], users[1])
+        self.login(users[1], pwds[1])
 
         comment = 'this is a sample comment'
         self.comment_datarequest(datarequest_id, comment)
@@ -611,7 +617,7 @@ def _check_is_editable(editable):
 
         # First user is not able to modify the comment
         self.logout()
-        self.login(users[0], users[0])
+        self.login(users[0], pwds[0])
 
         self.driver.get(self.base_url + 'datarequest/comment/' +
                         datarequest_id)
@@ -627,8 +633,8 @@ def test_update_comment(self, comment_length=10, expected_error=None):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         datarequest_title = 'Data Request 1'
         datarequest_description = 'Example Description'
@@ -653,8 +659,8 @@ def test_delete_comment(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         datarequest_title = 'Data Request 1'
         datarequest_description = 'Example Description'
@@ -665,7 +671,7 @@ def test_delete_comment(self):
 
         # Delete the comment
         self.driver.find_element_by_css_selector('i.fa-times').click()
-        self.driver.find_element_by_css_selector('button.btn.btn-primary').click()
+        self.driver.find_element_by_css_selector('.modal-footer > button.btn.btn-primary').click()
 
         # Check that the comment has been deleted
         self.assertEqual('This data request has not been commented yet',
@@ -677,8 +683,8 @@ def test_new_comments_always_visible(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         datarequest_title = 'Data Request 1'
         datarequest_description = 'Example Description'
@@ -699,8 +705,8 @@ def test_create_invalid_comment(self):
 
         user = 'user1'
 
-        self.default_register(user)
-        self.login(user, user)
+        pwd = self.default_register(user)
+        self.login(user, pwd)
 
         # Create Data Request
         datarequest_title = 'Data Request 1'
diff --git a/ckanext/datarequests/tests/test_ui_controller.py b/ckanext/datarequests/tests/test_ui_controller.py
index 0c9faa2a..a87d00ee 100644
--- a/ckanext/datarequests/tests/test_ui_controller.py
+++ b/ckanext/datarequests/tests/test_ui_controller.py
@@ -632,8 +632,9 @@ def _get_action(action):
         self.assertEquals(expected_facet_titles, controller.c.facet_titles)
 
         # Check that the render functions has been called with the suitable parameters
+        expected_user = controller.c.user_dict if hasattr(controller.c, 'user_dict') else None
         self.assertEquals(controller.tk.render.return_value, result)
-        controller.tk.render.assert_called_once_with(expected_render_page)
+        controller.tk.render.assert_called_once_with(expected_render_page, extra_vars={'user_dict': expected_user, 'group_type': 'organization'})
 
 
     ######################################################################
diff --git a/setup.py b/setup.py
index 0de0f3de..42ce27d5 100644
--- a/setup.py
+++ b/setup.py
@@ -20,7 +20,7 @@
 from setuptools import setup, find_packages
 import sys, os
 
-version = '1.0.0'
+version = '1.1.0'
 
 setup(
     name='ckanext-datarequests',