diff --git a/Dresden Files Role-Playing Game/DFRPG.css b/Dresden Files Role-Playing Game/DFRPG.css
index 3138b86261..9e0d2d247b 100644
--- a/Dresden Files Role-Playing Game/DFRPG.css	
+++ b/Dresden Files Role-Playing Game/DFRPG.css	
@@ -1460,7 +1460,9 @@
         width:60%;
     }
     .powers{
-    
+        .itemcontrol{
+            z-index : 1;
+        }
         padding: .5rem;
         .power{
             /* Conditional Visibility */
@@ -1490,10 +1492,28 @@
                     text-align: center;
                 }
             }
+            .chat-hover{
+                position: absolute;
+                top:-0.5rem;
+                right: 1.5rem;
+                width:18px;
+                height:18px;
+                z-index: 1;
+                display: none;
+    
+                span{
+                    font-variant: normal;
+                    font-family: Pictos;
+                    color: darkgray;
+                }
+            }
+            &:hover .chat-hover{
+                display: block;
+            }
             .options-flag{
                 position: absolute;
-                top:0;
-                left: .25rem;
+                top:-0.5rem;
+                right: .25rem;
                 width:18px;
                 height:18px;
                 z-index: 1;
@@ -1508,8 +1528,8 @@
                 position: absolute;
                 font-variant: normal;
                 font-family: Pictos;
-                top:0;
-                left: .25rem;
+                top:-0.5rem;
+                right: .25rem;
                 padding: 0;
                 display: none;
             }
@@ -1528,8 +1548,8 @@
                 display: flex;
             }
     
-            /* Title Button */
-            button[type="roll"]{
+            /* Title */
+            .power-summary{
                 border: none;
                 box-shadow: none;
                 background-color: transparent;
@@ -1572,9 +1592,6 @@
                     align-items: center;
                 }
             }
-            button[type="roll"]:before{
-                content: '';
-            }
         }
     }
     /*Hover Link Button */
@@ -1598,6 +1615,14 @@
     div.section:hover > .hover-button{
         display: block;
     }
+    
+    .text-button{
+        background: none;
+        border: none;
+    }
+    .text-button:before{
+        content: '';
+    }
 }
 /* ROLL TEMPLATES */
 
@@ -1695,8 +1720,18 @@
     font-weight: bold;
 }
 
-.sheet-rolltemplate-linkroll .sheet-rolltemplate-note .sheet-rolltemplate-key{
-    width: 30%;
+.sheet-rolltemplate-linkroll .sheet-rolltemplate-note .sheet-rolltemplate-desc{
+    width: 95%;
+    display : block;
+    padding: 0 8px 8px;
+    text-align: left;
+}
+.sheet-rolltemplate-linkroll .sheet-rolltemplate-note .sheet-rolltemplate-desc-title{
+    width: 95%;
+    display : block;
+    padding: 8px;
+    text-align: left;
+    font-weight: bold;
 }
 
 .sheet-rolltemplate-descriptiveroll .sheet-rolltemplate-note .sheet-rolltemplate-value,
diff --git a/Dresden Files Role-Playing Game/DFRPG.html b/Dresden Files Role-Playing Game/DFRPG.html
index e050c4ad9a..ef59627711 100644
--- a/Dresden Files Role-Playing Game/DFRPG.html	
+++ b/Dresden Files Role-Playing Game/DFRPG.html	
@@ -1038,12 +1038,13 @@
                     
                         <fieldset class="repeating_powers">
                             <div class="power">
-                                <button type="roll" value="@{power-roll}" class="power-sumary">
+                                <button type="roll" value="@{power-roll}" class="text-button chat-hover"><span>w</span></button>
+                                    <div class="power-summary">
                                     <div class="round"><span name="attr_power-cost"></span></div>
                                     <div class="title"><span name="attr_power"></span></div>
-                                </button>
+                                    </div>
                                 <input type="hidden" name="attr_power-roll"
-                                       value="&{template:linkroll} {{check=@{power}}} {{name=@{character_name} (Stunt/Power)}} {{Cost=@{power-cost}}} {{Description=@{power-desc}}} {{Effects=@{power-effects}}} {{Notes=@{power-notes}}}"/>
+                                       value="&{template:linkroll} {{check=@{power}}} {{name=@{character_name} (Stunt/Power)}} {{Cost=@{power-cost}}} {{description=@{power-desc}}} {{effects=@{power-effects}}} {{notes=@{power-notes}}}"/>
                                 <input type="checkbox" name="attr_power-options" class="options-flag" checked="checked"/>
                                 <span>y</span>
                                 <div class="flex-column options">
@@ -2371,7 +2372,7 @@
             {{/check}}
         </div>
 
-        {{#allprops() name check verb descriptivename descriptiveroll descriptivename2 descriptiveroll2 descriptivename3 descriptiveroll3}}
+        {{#allprops() name check verb description notes effects}}
         <div class="rolltemplate-note">
             <div class="rolltemplate-key">
                 {{key}}
@@ -2380,7 +2381,29 @@
                 {{value}}
             </div>
         </div>
-        {{/allprops() name check verb descriptivename descriptiveroll descriptivename2 descriptiveroll2 descriptivename3 descriptiveroll3}}
+        {{/allprops() name check verb description notes effects}}
+
+        {{#description}}
+        <div class="rolltemplate-note">
+            <div class="rolltemplate-desc-title">Description</div>
+            <div class="rolltemplate-desc">{{description}}</div>
+        </div>
+        {{/description}}
+
+        {{#effects}}
+        <div class="rolltemplate-note">
+            <div class="rolltemplate-desc-title">Effects</div>
+            <div class="rolltemplate-desc">{{effects}}</div>
+        </div>
+        {{/effects}}
+
+        {{#notes}}
+        <div class="rolltemplate-note">
+            <div class="rolltemplate-desc-title">Notes</div>
+            <div class="rolltemplate-desc">{{notes}}</div>
+        </div>
+        {{/notes}}
+
     </div>
 </rolltemplate>
 
diff --git a/Dresden Files Role-Playing Game/src/css/buttons.css b/Dresden Files Role-Playing Game/src/css/buttons.css
index f750b6a829..5e06662cd4 100644
--- a/Dresden Files Role-Playing Game/src/css/buttons.css	
+++ b/Dresden Files Role-Playing Game/src/css/buttons.css	
@@ -18,4 +18,12 @@ div.power:hover > .hover-button,
 div.theme-threat-face:hover > .hover-button,
 div.section:hover > .hover-button{
     display: block;
+}
+
+.text-button{
+    background: none;
+    border: none;
+}
+.text-button:before{
+    content: '';
 }
\ No newline at end of file
diff --git a/Dresden Files Role-Playing Game/src/css/components/powers.css b/Dresden Files Role-Playing Game/src/css/components/powers.css
index 98935490a3..fb6afbb7cd 100644
--- a/Dresden Files Role-Playing Game/src/css/components/powers.css	
+++ b/Dresden Files Role-Playing Game/src/css/components/powers.css	
@@ -1,5 +1,7 @@
 .powers{
-
+    .itemcontrol{
+        z-index : 1;
+    }
     padding: .5rem;
     .power{
         /* Conditional Visibility */
@@ -29,10 +31,28 @@
                 text-align: center;
             }
         }
+        .chat-hover{
+            position: absolute;
+            top:-0.5rem;
+            right: 1.5rem;
+            width:18px;
+            height:18px;
+            z-index: 1;
+            display: none;
+
+            span{
+                font-variant: normal;
+                font-family: Pictos;
+                color: darkgray;
+            }
+        }
+        &:hover .chat-hover{
+            display: block;
+        }
         .options-flag{
             position: absolute;
-            top:0;
-            left: .25rem;
+            top:-0.5rem;
+            right: .25rem;
             width:18px;
             height:18px;
             z-index: 1;
@@ -47,8 +67,8 @@
             position: absolute;
             font-variant: normal;
             font-family: Pictos;
-            top:0;
-            left: .25rem;
+            top:-0.5rem;
+            right: .25rem;
             padding: 0;
             display: none;
         }
@@ -67,8 +87,8 @@
             display: flex;
         }
 
-        /* Title Button */
-        button[type="roll"]{
+        /* Title */
+        .power-summary{
             border: none;
             box-shadow: none;
             background-color: transparent;
@@ -111,8 +131,5 @@
                 align-items: center;
             }
         }
-        button[type="roll"]:before{
-            content: '';
-        }
     }
 }
\ No newline at end of file
diff --git a/Dresden Files Role-Playing Game/src/css/roll-templates.css b/Dresden Files Role-Playing Game/src/css/roll-templates.css
index 83d85ea00e..55c1874281 100644
--- a/Dresden Files Role-Playing Game/src/css/roll-templates.css	
+++ b/Dresden Files Role-Playing Game/src/css/roll-templates.css	
@@ -94,8 +94,18 @@
     font-weight: bold;
 }
 
-.sheet-rolltemplate-linkroll .sheet-rolltemplate-note .sheet-rolltemplate-key{
-    width: 30%;
+.sheet-rolltemplate-linkroll .sheet-rolltemplate-note .sheet-rolltemplate-desc{
+    width: 95%;
+    display : block;
+    padding: 0 8px 8px;
+    text-align: left;
+}
+.sheet-rolltemplate-linkroll .sheet-rolltemplate-note .sheet-rolltemplate-desc-title{
+    width: 95%;
+    display : block;
+    padding: 8px;
+    text-align: left;
+    font-weight: bold;
 }
 
 .sheet-rolltemplate-descriptiveroll .sheet-rolltemplate-note .sheet-rolltemplate-value,
diff --git a/Dresden Files Role-Playing Game/src/html/character/powers.html b/Dresden Files Role-Playing Game/src/html/character/powers.html
index 0e35cab39b..926f3f64ae 100644
--- a/Dresden Files Role-Playing Game/src/html/character/powers.html	
+++ b/Dresden Files Role-Playing Game/src/html/character/powers.html	
@@ -6,12 +6,13 @@
 
     <fieldset class="repeating_powers">
         <div class="power">
-            <button type="roll" value="@{power-roll}" class="power-sumary">
+            <button type="roll" value="@{power-roll}" class="text-button chat-hover"><span>w</span></button>
+                <div class="power-summary">
                 <div class="round"><span name="attr_power-cost"></span></div>
                 <div class="title"><span name="attr_power"></span></div>
-            </button>
+                </div>
             <input type="hidden" name="attr_power-roll"
-                   value="&{template:linkroll} {{check=@{power}}} {{name=@{character_name} (Stunt/Power)}} {{Cost=@{power-cost}}} {{Description=@{power-desc}}} {{Effects=@{power-effects}}} {{Notes=@{power-notes}}}"/>
+                   value="&{template:linkroll} {{check=@{power}}} {{name=@{character_name} (Stunt/Power)}} {{Cost=@{power-cost}}} {{description=@{power-desc}}} {{effects=@{power-effects}}} {{notes=@{power-notes}}}"/>
             <input type="checkbox" name="attr_power-options" class="options-flag" checked="checked"/>
             <span>y</span>
             <div class="flex-column options">
diff --git a/Dresden Files Role-Playing Game/src/html/roll-templates.html b/Dresden Files Role-Playing Game/src/html/roll-templates.html
index 0916c8d29b..f13bf52242 100644
--- a/Dresden Files Role-Playing Game/src/html/roll-templates.html	
+++ b/Dresden Files Role-Playing Game/src/html/roll-templates.html	
@@ -390,7 +390,7 @@
             {{/check}}
         </div>
 
-        {{#allprops() name check verb descriptivename descriptiveroll descriptivename2 descriptiveroll2 descriptivename3 descriptiveroll3}}
+        {{#allprops() name check verb description notes effects}}
         <div class="rolltemplate-note">
             <div class="rolltemplate-key">
                 {{key}}
@@ -399,6 +399,28 @@
                 {{value}}
             </div>
         </div>
-        {{/allprops() name check verb descriptivename descriptiveroll descriptivename2 descriptiveroll2 descriptivename3 descriptiveroll3}}
+        {{/allprops() name check verb description notes effects}}
+
+        {{#description}}
+        <div class="rolltemplate-note">
+            <div class="rolltemplate-desc-title">Description</div>
+            <div class="rolltemplate-desc">{{description}}</div>
+        </div>
+        {{/description}}
+
+        {{#effects}}
+        <div class="rolltemplate-note">
+            <div class="rolltemplate-desc-title">Effects</div>
+            <div class="rolltemplate-desc">{{effects}}</div>
+        </div>
+        {{/effects}}
+
+        {{#notes}}
+        <div class="rolltemplate-note">
+            <div class="rolltemplate-desc-title">Notes</div>
+            <div class="rolltemplate-desc">{{notes}}</div>
+        </div>
+        {{/notes}}
+
     </div>
 </rolltemplate>
\ No newline at end of file