diff --git a/public/css/app.css b/public/css/app.css
index 4bea892..4e42bc7 100644
--- a/public/css/app.css
+++ b/public/css/app.css
@@ -16,6 +16,7 @@ div {
 }
 
 .disclaimer {
+  flex: 0;
   font-size: 0.75rem;
   padding: 0.5rem;
 }
@@ -73,6 +74,8 @@ div {
 }
 
 .chat-column {
+  display: flex;
+  flex-direction: column;
   height: 90%;
   padding: 0.9375rem 0 0.625rem 0;
   margin: auto;
@@ -82,6 +85,7 @@ div {
 }
 
 .user-typing {
+  flex: 0;
   border: none;
   color: #8d25e8;
   margin: 0.75rem;
@@ -93,7 +97,7 @@ div {
   margin: 0.75rem;
   overflow-y: auto;
   overflow-x: hidden;
-  height: calc(100% - 4rem);
+  flex: 1;
 }
 
 .message-inner {
@@ -407,4 +411,4 @@ html{
   justify-content: space-between;
   font-size: 0.85rem;
   display: inline-block;
-}
\ No newline at end of file
+}
diff --git a/public/index.html b/public/index.html
index d477cab..21d4ebc 100644
--- a/public/index.html
+++ b/public/index.html
@@ -32,6 +32,12 @@
           Data Protection
           Regulation (EU) 2016/679.
         </div>
+        <div class="disclaimer">
+          By using this application, you agree to the&nbsp;
+          <a target="_blank" rel="noreferrer noopener" href="https://watson-developer-cloud.github.io/terms?name=Watson%20Assistant%20Demo">
+            Terms of Use
+          </a>
+        </div>
       </div>
     </div>
     <div id="payload-column" class="fixed-column content-column">
@@ -51,4 +57,4 @@
   <script src="js/global.js"></script>
   <script type="text/javascript" src="https://cdn.rawgit.com/watson-developer-cloud/watson-developer-cloud.github.io/master/analytics.js"></script>
 </body>
-</html>
\ No newline at end of file
+</html>