diff --git a/frontend/src/component/application/application-edit-component.js b/frontend/src/component/application/application-edit-component.js
index 70c298b3c9..2e7a86adba 100644
--- a/frontend/src/component/application/application-edit-component.js
+++ b/frontend/src/component/application/application-edit-component.js
@@ -2,7 +2,7 @@
 import React, { Component, PureComponent } from 'react';
 
 import { Link } from 'react-router';
-import { Grid, Cell, List, ListItem, ListItemContent, Textfield, Icon } from 'react-mdl';
+import { Grid, Cell, List, ListItem, ListItemContent, Textfield, Icon, ProgressBar } from 'react-mdl';
 import { HeaderTitle } from '../common';
 
 class StatefulTextfield extends Component {
@@ -32,7 +32,7 @@ class ClientStrategies extends PureComponent {
 
     render () {
         if (!this.props.application) {
-            return <div>Loading application info...</div>;
+            return <ProgressBar indeterminate />;
         }
         const {
             application,
diff --git a/frontend/src/component/application/application-list-component.js b/frontend/src/component/application/application-list-component.js
index 5188c638d1..2c472cb596 100644
--- a/frontend/src/component/application/application-list-component.js
+++ b/frontend/src/component/application/application-list-component.js
@@ -1,4 +1,5 @@
 import React, { Component } from 'react';
+import { ProgressBar } from 'react-mdl';
 import { AppsLinkList, HeaderTitle } from '../common';
 
 class ClientStrategies extends Component {
@@ -13,7 +14,7 @@ class ClientStrategies extends Component {
         } = this.props;
 
         if (!applications) {
-            return <div>Loading...</div>;
+            return <ProgressBar indeterminate />;
         }
         return (
             <div>
diff --git a/frontend/src/component/feature/view-edit-container.jsx b/frontend/src/component/feature/view-edit-container.jsx
index 111fdc96fe..0b6b96fd9d 100644
--- a/frontend/src/component/feature/view-edit-container.jsx
+++ b/frontend/src/component/feature/view-edit-container.jsx
@@ -1,5 +1,5 @@
 import React, { PropTypes } from 'react';
-import { Grid, Cell, Icon, Switch, List, ListItem, ListItemContent } from 'react-mdl';
+import { Grid, Cell, Icon, ProgressBar, List, ListItem, ListItemContent } from 'react-mdl';
 import { Link } from 'react-router';
 
 import percentLib from 'percent';
@@ -61,7 +61,7 @@ class EditFeatureToggleWrapper extends React.Component {
 
         if (!featureToggle) {
             if (features.length === 0 ) {
-                return <span>Loading</span>;
+                return <ProgressBar indeterminate />;
             }
             return <span>Could not find the toggle "{this.props.featureToggleName}"</span>;
         }