diff --git a/admin/index.html b/admin/index.html
index 209f3012c46..1ac7228138f 100644
--- a/admin/index.html
+++ b/admin/index.html
@@ -280,7 +280,7 @@ <h4>${option.name|encodeForHTML}</h4>
                                             {elseif element.type === "internationalizableText"}
                                                 <div class="admin-internationalizable-text-container">
                                                     <div class="form-group">
-                                                        <label for="${configPath|encodeForHTMLAttribute}" class="control-label col-xs-12 col-sm-3 col-md-3">Choose terms and conditions language to change</label>
+                                                        <label for="${configPath|encodeForHTMLAttribute}" class="control-label col-xs-12 col-sm-3 col-md-3">Choose language to change</label>
                                                         <div class="col-xs-12 col-sm-9 col-md-9">
                                                             <select class="admin-internationalizabletext-language-picker form-control" id="${configPath|encodeForHTMLAttribute}">
                                                                 <option value="default">Default</option>
diff --git a/docs/css/doc.css b/docs/css/doc.css
index ad32f86ab1c..b6a3587b01a 100644
--- a/docs/css/doc.css
+++ b/docs/css/doc.css
@@ -108,7 +108,8 @@ td form {
     padding: 8px 14px;
     word-break: break-word;
 }
-.bs-docs-sidenav > li > a > div {
+.bs-docs-sidenav > li > a > span {
+    display: block;
     margin-right: 22px;
 }
 .bs-docs-sidenav .icon-chevron-right {
diff --git a/docs/index.html b/docs/index.html
index e1102ae1ce1..81c6293df4b 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -36,7 +36,7 @@ <h5>${title}</h5>
                 <ul class="nav nav-list bs-docs-sidenav">
                     {for module in modules}
                         <li data-id="${module}" data-type="${type}">
-                            <a href="/docs/${type}/${module}"><i class="icon-chevron-right pull-right"></i> <div>${module}</div></a>
+                            <a href="/docs/${type}/${module}"><i class="icon-chevron-right pull-right"></i> <span>${module}</span></a>
                         </li>
                     {/for}
                 </ul>
diff --git a/node_modules/oae-core/activity/css/activity.css b/node_modules/oae-core/activity/css/activity.css
index f1aeab5f8f3..7f2245de084 100644
--- a/node_modules/oae-core/activity/css/activity.css
+++ b/node_modules/oae-core/activity/css/activity.css
@@ -19,6 +19,10 @@
     width: 35px;
 }
 
+.activity-widget .activity-summary a {
+    word-break: break-all;
+}
+
 .activity-widget small {
     font-size: 12px;
 }
diff --git a/node_modules/oae-core/creatediscussion/creatediscussion.html b/node_modules/oae-core/creatediscussion/creatediscussion.html
index ad34e3a89b8..ce9a88b8dbc 100644
--- a/node_modules/oae-core/creatediscussion/creatediscussion.html
+++ b/node_modules/oae-core/creatediscussion/creatediscussion.html
@@ -25,7 +25,7 @@ <h3 id="creatediscussion-modal-title">__MSG__START_DISCUSSION__</h3>
                             <div id="creatediscussion-permissions-summary"><!-- --></div>
                         </div>
                     </div>
-                    <div id="creatediscussion-permissions-container" class="hide"></div>
+                    <div id="creatediscussion-permissions-container" class="hide"><!-- --></div>
                 </div>
                 <div class="modal-footer">
                     <button type="button" class="btn btn-link pull-left" data-dismiss="modal">__MSG__CANCEL__</button>
diff --git a/shared/oae/api/oae.api.util.js b/shared/oae/api/oae.api.util.js
index 8d90135d3d0..8fe13bf4342 100755
--- a/shared/oae/api/oae.api.util.js
+++ b/shared/oae/api/oae.api.util.js
@@ -310,7 +310,7 @@ define(['exports', 'require', 'jquery', 'underscore', 'oae.api.config', 'jquery.
      * a close button for closing the notification. Notifications can be used as a confirmation message, error message, etc.
      *
      * This function is mostly just a wrapper around jQuery.bootstrap.notify.js and supports all of the options documented
-     * at http://nijikokun.github.com/bootstrap-notify/.
+     * at https://github.com/goodybag/bootstrap-notify.
      *
      * @param  {String}     [title]       The notification title
      * @param  {String}     message       The notification message that will be shown underneath the title. The message should be sanitized by the caller to allow for HTML inside of the notification
diff --git a/shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js b/shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js
index 18a2fb9d6ee..cd8e2f6086a 100644
--- a/shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js
+++ b/shared/vendor/js/bootstrap-plugins/bootstrap.notify.oae-edited.js
@@ -1,7 +1,6 @@
 /**
- * bootstrap-notify.js v1.0.0
+ * bootstrap-notify.js v1.0
  * --
- * Copyright 2012 Nijiko Yonskai <nijikokun@gmail.com>
  * Copyright 2012 Goodybag, Inc.
  * --
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,61 +16,65 @@
  * limitations under the License.
  */
 
-define(['jquery'], function (jQuery) {
 (function ($) {
   var Notification = function (element, options) {
     // Element collection
-    this.$element = $(element);
-    this.$note    = $('<div class="alert alert-dismissable"></div>');
     this.options  = $.extend(true, {}, $.fn.notify.defaults, options);
-    this._link    = null;
+    this.$element = $(element);
+    this.$note    = $('<div class="alert"></div>');
+    if (this.options.closable) {
+        this.$note    = $('<div class="alert alert-dismissable"></div>');
+    }
 
     // Setup from options
-    if (this.options.transition)
-      if (this.options.transition === 'fade')
+    if(this.options.transition)
+      if(this.options.transition == 'fade')
         this.$note.addClass('in').addClass(this.options.transition);
       else this.$note.addClass(this.options.transition);
     else this.$note.addClass('fade').addClass('in');
 
-    if (this.options.type)
+    if(this.options.type)
       this.$note.addClass('alert-' + this.options.type);
     else this.$note.addClass('alert-success');
 
-    if (this.options.message)
-      if (typeof this.options.message === 'string')
-        this.$note.html(this.options.message);
-      else if (typeof this.options.message === 'object')
-        if (this.options.message.html)
+    if(!this.options.message && this.$element.data("message") !== '') // dom text
+      this.$note.html(this.$element.data("message"));
+    else
+      if(typeof this.options.message === 'object')
+        if(this.options.message.html)
           this.$note.html(this.options.message.html);
-        else if (this.options.message.text)
+        else if(this.options.message.text)
           this.$note.text(this.options.message.text);
+      else
+        this.$note.html(this.options.message);
 
-    if (this.options.closable)
-      this._link = $('<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times</button>'),
-      $(this._link).on('click', $.proxy(Notification.onClose, this)),
-      this.$note.prepend(this._link);
+    if(this.options.closable)
+      var link = $('<a class="close pull-right" href="#">&times;</a>');
+      $(link).on('click', $.proxy(onClose, this));
+      this.$note.prepend(link);
 
     return this;
   };
 
-  Notification.onClose = function () {
+  var onClose = function() {
     this.options.onClose();
     $(this.$note).remove();
     this.options.onClosed();
+    return false;
   };
 
   Notification.prototype.show = function () {
-    if (this.options.fadeOut.enabled)
-      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(Notification.onClose, this));
+    if(this.options.fadeOut.enabled)
+      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(onClose, this));
 
     this.$element.append(this.$note);
     this.$note.alert();
   };
 
   Notification.prototype.hide = function () {
-    if (this.options.fadeOut.enabled)
-      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(Notification.onClose, this));
-    else Notification.onClose.call(this);
+    if(this.options.fadeOut.enabled)
+      this.$note.delay(this.options.fadeOut.delay || 3000).fadeOut('slow', $.proxy(onClose, this));
+    else onClose.call(this);
   };
 
   $.fn.notify = function (options) {
@@ -89,6 +92,5 @@ define(['jquery'], function (jQuery) {
     message: null,
     onClose: function () {},
     onClosed: function () {}
-  };
+  }
 })(window.jQuery);
-});