diff --git a/bemani/frontend/static/controllers/popn/records.react.js b/bemani/frontend/static/controllers/popn/records.react.js
index 466a1b3..8b347be 100644
--- a/bemani/frontend/static/controllers/popn/records.react.js
+++ b/bemani/frontend/static/controllers/popn/records.react.js
@@ -177,7 +177,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 { paginate ?
                     <div className="section popn-nav" key="paginatebuttons">
                         {songids.map(function(songid) {
@@ -291,7 +291,7 @@ var network_records = createReactClass({
                         </tbody>
                     </table>
                 </div>
-            </span>
+            </>
         );
     },
 
@@ -363,7 +363,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -380,7 +380,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
@@ -413,7 +413,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -430,7 +430,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/popn/rivals.react.js b/bemani/frontend/static/controllers/popn/rivals.react.js
index df816c1..4465027 100644
--- a/bemani/frontend/static/controllers/popn/rivals.react.js
+++ b/bemani/frontend/static/controllers/popn/rivals.react.js
@@ -131,7 +131,7 @@ var rivals_view = createReactClass({
         if (count >= window.max_active_rivals[this.state.version]) { avail = false; }
 
         return (
-            <span>
+            <>
                 {avail ?
                     <Add
                         title="Add Rival"
@@ -141,7 +141,7 @@ var rivals_view = createReactClass({
                     /> :
                     null
                 }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/popn/settings.react.js b/bemani/frontend/static/controllers/popn/settings.react.js
index e287771..9c02b94 100644
--- a/bemani/frontend/static/controllers/popn/settings.react.js
+++ b/bemani/frontend/static/controllers/popn/settings.react.js
@@ -54,14 +54,14 @@ var settings_view = createReactClass({
         return (
             <LabelledSection vertical={true} label="Name">{
                 !this.state.editing_name ?
-                    <span>
+                    <>
                         <span>{player.name}</span>
                         <Edit
                             onClick={function(event) {
                                 this.setState({editing_name: true});
                             }.bind(this)}
                         />
-                    </span> :
+                    </> :
                     <form className="inline" onSubmit={this.saveName}>
                         <input
                             type="text"
diff --git a/bemani/frontend/static/controllers/reflec/records.react.js b/bemani/frontend/static/controllers/reflec/records.react.js
index e65ee08..6a11436 100644
--- a/bemani/frontend/static/controllers/reflec/records.react.js
+++ b/bemani/frontend/static/controllers/reflec/records.react.js
@@ -57,10 +57,10 @@ var HighScore = createReactClass({
                     <span className="score">{this.props.score.points}</span>
                     <span className="label">M</span>
                     <span className="score">{this.props.score.miss_count < 0 ? '-' : this.props.score.miss_count}</span>
-                    {this.props.score.combo >= 0 ? <span>
+                    {this.props.score.combo >= 0 ? <>
                         <span className="label">Combo</span>
                         <span className="score">{this.props.score.combo}</span>
-                    </span> : null}
+                    </> : null}
                 </div>
                 <div>
                     <span className="status">{this.props.score.combo_type}</span>
@@ -195,7 +195,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 { paginate ?
                     <div className="section" key="paginatebuttons">
                         {songids.map(function(songid) {
@@ -308,7 +308,7 @@ var network_records = createReactClass({
                         </tbody>
                     </table>
                 </div>
-            </span>
+            </>
         );
     },
 
@@ -380,7 +380,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -397,7 +397,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
@@ -430,7 +430,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -447,7 +447,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
@@ -480,7 +480,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -497,7 +497,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/reflec/rivals.react.js b/bemani/frontend/static/controllers/reflec/rivals.react.js
index dfedb4b..e960b58 100644
--- a/bemani/frontend/static/controllers/reflec/rivals.react.js
+++ b/bemani/frontend/static/controllers/reflec/rivals.react.js
@@ -131,7 +131,7 @@ var rivals_view = createReactClass({
         if (count >= 30) { avail = false; }
 
         return (
-            <span>
+            <>
                 {avail ?
                     <Add
                         title="Add Rival"
@@ -141,7 +141,7 @@ var rivals_view = createReactClass({
                     /> :
                     null
                 }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/reflec/scores.react.js b/bemani/frontend/static/controllers/reflec/scores.react.js
index c8bda75..1b64192 100644
--- a/bemani/frontend/static/controllers/reflec/scores.react.js
+++ b/bemani/frontend/static/controllers/reflec/scores.react.js
@@ -76,10 +76,10 @@ var network_scores = createReactClass({
                     <span className="score">{score.points}</span>
                     <span className="label">M</span>
                     <span className="score">{score.miss_count < 0 ? '-' : score.miss_count}</span>
-                    {score.combo >= 0 ? <span>
+                    {score.combo >= 0 ? <>
                         <span className="label">Combo</span>
                         <span className="score">{score.combo}</span>
-                    </span> : null}
+                    </> : null}
                 </div>
                 <div>
                     <span className="status">{score.combo_type}</span>
diff --git a/bemani/frontend/static/controllers/reflec/settings.react.js b/bemani/frontend/static/controllers/reflec/settings.react.js
index 0bbca1a..c2ea16c 100644
--- a/bemani/frontend/static/controllers/reflec/settings.react.js
+++ b/bemani/frontend/static/controllers/reflec/settings.react.js
@@ -54,14 +54,14 @@ var settings_view = createReactClass({
         return (
             <LabelledSection vertical={true} label="Name">{
                 !this.state.editing_name ?
-                    <span>
+                    <>
                         <span>{player.name}</span>
                         <Edit
                             onClick={function(event) {
                                 this.setState({editing_name: true});
                             }.bind(this)}
                         />
-                    </span> :
+                    </> :
                     <form className="inline" onSubmit={this.saveName}>
                         <input
                             type="text"