diff --git a/bemani/frontend/static/controllers/bishi/settings.react.js b/bemani/frontend/static/controllers/bishi/settings.react.js
index a61d54e..681143b 100644
--- a/bemani/frontend/static/controllers/bishi/settings.react.js
+++ b/bemani/frontend/static/controllers/bishi/settings.react.js
@@ -61,14 +61,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/ddr/records.react.js b/bemani/frontend/static/controllers/ddr/records.react.js
index 5a818fc..9d3dbb0 100644
--- a/bemani/frontend/static/controllers/ddr/records.react.js
+++ b/bemani/frontend/static/controllers/ddr/records.react.js
@@ -174,7 +174,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 { paginate ?
                     <div className="section">
                         {songids.map(function(songid) {
@@ -343,7 +343,7 @@ var network_records = createReactClass({
                         </tbody>
                     </table>
                 </div>
-            </span>
+            </>
         );
     },
 
@@ -417,7 +417,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -434,7 +434,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
@@ -469,7 +469,7 @@ var network_records = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 <div className="section">
                     {window.valid_charts.map(function(chartname, index) {
                         return (
@@ -486,7 +486,7 @@ var network_records = createReactClass({
                     }.bind(this))}
                 </div>
                 { this.renderBySongIDList(songids, false) }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/ddr/rivals.react.js b/bemani/frontend/static/controllers/ddr/rivals.react.js
index 85ff8d8..940b82a 100644
--- a/bemani/frontend/static/controllers/ddr/rivals.react.js
+++ b/bemani/frontend/static/controllers/ddr/rivals.react.js
@@ -145,7 +145,7 @@ var rivals_view = createReactClass({
         }
 
         return (
-            <span>
+            <>
                 {avail ?
                     <Add
                         title="Add Rival"
@@ -155,7 +155,7 @@ var rivals_view = createReactClass({
                     /> :
                     null
                 }
-            </span>
+            </>
         );
     },
 
diff --git a/bemani/frontend/static/controllers/ddr/settings.react.js b/bemani/frontend/static/controllers/ddr/settings.react.js
index f1613d3..2d0e3e5 100644
--- a/bemani/frontend/static/controllers/ddr/settings.react.js
+++ b/bemani/frontend/static/controllers/ddr/settings.react.js
@@ -167,14 +167,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"
@@ -216,7 +216,7 @@ var settings_view = createReactClass({
         return (
             <LabelledSection vertical={true} label="Weight">{
                 !this.state.editing_weight ?
-                    <span>
+                    <>
                         { player.workout_mode ?
                             <span>{player.weight / 10} kg</span> :
                             <span className="placeholder">workout mode disabled</span>
@@ -226,7 +226,7 @@ var settings_view = createReactClass({
                                 this.setState({editing_weight: true});
                             }.bind(this)}
                         />
-                    </span> :
+                    </> :
                     <form className="inline" onSubmit={this.saveWeight}>
                         <div className="row">
                             <input
@@ -320,13 +320,13 @@ var settings_view = createReactClass({
                         <h3>User Profile</h3>
                         {this.renderName(player)}
                         <LabelledSection vertical={true} label={
-                            <span>
+                            <>
                                 Fast/Slow Display
                                 { this.state.saving_early_late ?
                                     <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
                                     null
                                 }
-                            </span>
+                            </>
                         }>
                             <Slider
                                 on="on"
@@ -339,13 +339,13 @@ var settings_view = createReactClass({
                             />
                         </LabelledSection>
                         <LabelledSection vertical={true} label={
-                            <span>
+                            <>
                                 Combo Position
                                 { this.state.saving_background_combo ?
                                     <img className="loading" src={Link.get('static', 'loading-16.gif')} /> :
                                     null
                                 }
-                            </span>
+                            </>
                         }>
                             <Slider
                                 className="padded"