diff --git a/bemani/frontend/static/controllers/iidx/records.react.js b/bemani/frontend/static/controllers/iidx/records.react.js
index 5e88fe0..8c008a5 100644
--- a/bemani/frontend/static/controllers/iidx/records.react.js
+++ b/bemani/frontend/static/controllers/iidx/records.react.js
@@ -182,7 +182,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 { paginate ?
                     <div className="section">
                         {songids.map(function(songid) {
@@ -316,7 +316,7 @@ var network_records = createReactClass({
                         </tbody>
                     </table>
                 </div>
-            </span>
+            </>
         );
     },
 
@@ -395,7 +395,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -412,7 +412,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
@@ -447,7 +447,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -464,7 +464,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/iidx/rivals.react.js b/bemani/frontend/static/controllers/iidx/rivals.react.js
index e4aea96..f70c81d 100644
--- a/bemani/frontend/static/controllers/iidx/rivals.react.js
+++ b/bemani/frontend/static/controllers/iidx/rivals.react.js
@@ -118,7 +118,7 @@ var rivals_view = createReactClass({
         if (dp_count >= 5) { dp_avail = false; }
 
         return (
-            <span>
+            <>
                 {sp_avail ?
                     <Add
                         title="Add SP Rival"
@@ -137,7 +137,7 @@ var rivals_view = createReactClass({
                     /> :
                     null
                 }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/iidx/settings.react.js b/bemani/frontend/static/controllers/iidx/settings.react.js
index 43657ce..3970938 100644
--- a/bemani/frontend/static/controllers/iidx/settings.react.js
+++ b/bemani/frontend/static/controllers/iidx/settings.react.js
@@ -268,14 +268,14 @@ var settings_view = createReactClass({
         return (
             <LabelledSection vertical={true} label="DJ 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.saveDJName}>
                         <input
                             type="text"
@@ -317,14 +317,14 @@ var settings_view = createReactClass({
         return (
             <LabelledSection vertical={true} label="Prefecture">{
                 !this.state.editing_prefecture ?
-                    <span>
+                    <>
                         <span>{window.regions[player.prefecture]}</span>
                         <Edit
                             onClick={function(event) {
                                 this.setState({editing_prefecture: true});
                             }.bind(this)}
                         />
-                    </span> :
+                    </> :
                     <form className="inline" onSubmit={this.savePrefecture}>
                         <SelectInt
                             name="prefecture"