diff --git a/web/react/components/login.jsx b/web/react/components/login.jsx
index 380790b8ff..581b8e0b54 100644
--- a/web/react/components/login.jsx
+++ b/web/react/components/login.jsx
@@ -101,12 +101,10 @@ export default class Login extends React.Component {
                 <div>
                     {loginMessage}
                     <div className='or__container'>
-                        <span>
-                            <FormattedMessage
-                                id='login.or'
-                                defaultMessage='or'
-                            />
-                        </span>
+                        <FormattedMessage
+                            id='login.or'
+                            defaultMessage='or'
+                        />
                     </div>
                 </div>
             );
diff --git a/web/react/components/setting_item_min.jsx b/web/react/components/setting_item_min.jsx
index 868b7e1b25..cb2ee0d8f6 100644
--- a/web/react/components/setting_item_min.jsx
+++ b/web/react/components/setting_item_min.jsx
@@ -8,7 +8,7 @@ export default class SettingItemMin extends React.Component {
         let editButton = null;
         if (!this.props.disableOpen) {
             editButton = (
-                <li className='col-sm-2 section-edit'>
+                <li className='col-sm-3 section-edit'>
                     <a
                         className='theme'
                         href='#'
@@ -29,9 +29,9 @@ export default class SettingItemMin extends React.Component {
                 className='section-min'
                 onClick={this.props.updateSection}
             >
-                <li className='col-sm-10 section-title'>{this.props.title}</li>
+                <li className='col-sm-9 section-title'>{this.props.title}</li>
                 {editButton}
-                <li className='col-sm-7 section-describe'>{this.props.describe}</li>
+                <li className='col-sm-9 section-describe'>{this.props.describe}</li>
             </ul>
         );
     }
diff --git a/web/react/components/signup_user_complete.jsx b/web/react/components/signup_user_complete.jsx
index 740a7b166e..dbec3d02d0 100644
--- a/web/react/components/signup_user_complete.jsx
+++ b/web/react/components/signup_user_complete.jsx
@@ -351,12 +351,10 @@ class SignupUserComplete extends React.Component {
                 <div>
                     {signupMessage}
                     <div className='or__container'>
-                        <span>
-                            <FormattedMessage
-                                id='signup_user_completed.or'
-                                defaultMessage='or'
-                            />
-                        </span>
+                        <FormattedMessage
+                            id='signup_user_completed.or'
+                            defaultMessage='or'
+                        />
                     </div>
                 </div>
             );
diff --git a/web/sass-files/sass/partials/_settings.scss b/web/sass-files/sass/partials/_settings.scss
index c79b549222..8508ce6fc2 100644
--- a/web/sass-files/sass/partials/_settings.scss
+++ b/web/sass-files/sass/partials/_settings.scss
@@ -354,6 +354,9 @@
                 border-radius: 0;
                 font-weight: 400;
                 position: relative;
+                white-space: nowrap;
+                overflow: hidden;
+                text-overflow: ellipsis;
             }
         }
     }
diff --git a/web/sass-files/sass/partials/_signup.scss b/web/sass-files/sass/partials/_signup.scss
index e9c872a6ec..38ae14d7d8 100644
--- a/web/sass-files/sass/partials/_signup.scss
+++ b/web/sass-files/sass/partials/_signup.scss
@@ -115,7 +115,7 @@
 
     .signup-team-login {
         padding-bottom: 10px;
-        font-weight: 700;
+        font-weight: 600;
     }
 
     .signup-team__name {