diff --git a/public/content.css b/public/content.css
index dc5e94c3..636d8677 100644
--- a/public/content.css
+++ b/public/content.css
@@ -122,7 +122,6 @@
 .sponsorSkipNoticeParent {
     position: absolute;
 
-	right: 5px;
 	bottom: 100px;
 	right: 10px;
 }
diff --git a/src/components/NoticeComponent.tsx b/src/components/NoticeComponent.tsx
index c968afca..68e61a19 100644
--- a/src/components/NoticeComponent.tsx
+++ b/src/components/NoticeComponent.tsx
@@ -154,7 +154,7 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
 
                         {this.props.children}
 
-                        {!this.props.smaller ? 
+                        {!this.props.smaller && this.props.bottomRow ? 
                             this.props.bottomRow
                         : null}
 
@@ -162,9 +162,11 @@ class NoticeComponent extends React.Component<NoticeProps, NoticeState> {
                 </table>
 
                 {/* Add as a hidden table to keep the height constant */}
-                {this.props.smaller ? 
+                {this.props.smaller && this.props.bottomRow ? 
                     <table style={{visibility: "hidden", paddingTop: "14px"}}>
+                        <tbody>
                         {this.props.bottomRow}
+                        </tbody>
                     </table>
                 : null}
             </div>
diff --git a/src/components/SkipNoticeComponent.tsx b/src/components/SkipNoticeComponent.tsx
index 6126fac0..c5ffa166 100644
--- a/src/components/SkipNoticeComponent.tsx
+++ b/src/components/SkipNoticeComponent.tsx
@@ -348,7 +348,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
             return [
                 <tr id={"sponsorSkipNoticeSpacer" + this.idSuffix}
                     className="sponsorBlockSpacer"
-                    key={0}>
+                    key={"messageBoxSpacer"}>
                 </tr>
             ];
         }
@@ -360,7 +360,7 @@ class SkipNoticeComponent extends React.Component<SkipNoticeProps, SkipNoticeSta
                 <NoticeTextSelectionComponent idSuffix={this.idSuffix}
                     text={this.state.messages[i]}
                     onClick={this.state.messageOnClick}
-                    key={i}>
+                    key={"messageBox" + i}>
                 </NoticeTextSelectionComponent>
             )
         }