2 files changed, 2 insertions, 5 deletions

diff --git a/src/components/services/content/Services.js b/src/components/services/content/Services.js
index f679eeed0..7cf02c237 100644
--- a/src/components/services/content/Services.js
+++ b/src/components/services/content/Services.js
@@ -10,7 +10,6 @@ import injectSheet from 'react-jss';
 import ServiceView from './ServiceView';
 import Appear from '../../ui/effects/Appear';
 import serverlessLogin from '../../../helpers/serverless-helpers';
-import { TODOS_RECIPE_ID } from '../../../features/todos';
 
 const messages = defineMessages({
   welcome: {
@@ -171,7 +170,7 @@ export default @injectSheet(styles) @inject('actions') @observer class Services
             </div>
           </Appear>
         )}
-        {services.filter(service => service.recipe.id !== TODOS_RECIPE_ID).map(service => (
+        {services.filter(service => !service.isTodosService).map(service => (
           <ServiceView
             key={service.id}
             service={service}
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 8a362d3c9..b7e007186 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -390,12 +390,10 @@ export default @observer class EditSettingsForm extends Component {
                         )}
                       </div>
                     )}
+                    <Hr />
                   </>
                 )}
 
-
-                <Hr />
-
                 <Toggle field={form.$('scheduledDNDEnabled')} />
                 {scheduledDNDEnabled && (
                   <>