diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 359f845..7c20811 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -5,14 +5,9 @@ import { HttpClientModule } from '@angular/common/http';
 
 import { AppComponent } from './app.component';
 import { AppRoutingModule } from './app-routing.module';
-import { AuthGuard } from './auth/auth-guard.service';
-import { AuthModule } from './auth/auth.module';
-import { AuthService } from './auth/auth.service';
-import { DataStorageService } from './shared/data-storage.service';
-import { RecipeService } from './recipes/recipe.service';
 import { SharedModule } from './shared/shared.module';
 import { ShoppingListModule } from './shopping-list/shopping-list.module';
-import { ShoppingListService } from './shopping-list/shopping-list.service';
+import { AuthModule } from './auth/auth.module';
 import { CoreModule } from './core/core.module';
 
 @NgModule({
@@ -29,12 +24,6 @@ import { CoreModule } from './core/core.module';
     AuthModule,
     CoreModule
   ],
-  providers: [
-    ShoppingListService, 
-    RecipeService, 
-    DataStorageService, 
-    AuthService, 
-    AuthGuard],
   bootstrap: [AppComponent]
 })
 export class AppModule { }
diff --git a/src/app/core/core.module.ts b/src/app/core/core.module.ts
index 4c5ae81..7592006 100644
--- a/src/app/core/core.module.ts
+++ b/src/app/core/core.module.ts
@@ -4,6 +4,10 @@ import { HeaderComponent } from "./header/header.component";
 import { HomeComponent } from "./home/home.component";
 import { SharedModule } from "../shared/shared.module";
 import { AppRoutingModule } from "../app-routing.module";
+import { ShoppingListService } from "../shopping-list/shopping-list.service";
+import { RecipeService } from "../recipes/recipe.service";
+import { DataStorageService } from "../shared/data-storage.service";
+import { AuthService } from "../auth/auth.service";
 
 @NgModule({
     declarations: [
@@ -17,6 +21,12 @@ import { AppRoutingModule } from "../app-routing.module";
     exports: [
         AppRoutingModule,
         HeaderComponent
-    ]
+    ],
+    providers: [
+      ShoppingListService, 
+      RecipeService, 
+      DataStorageService, 
+      AuthService
+    ],
 })
 export class CoreModule {}
\ No newline at end of file
diff --git a/src/app/core/header/header.component.html b/src/app/core/header/header.component.html
index 6775324..a83d6b9 100644
--- a/src/app/core/header/header.component.html
+++ b/src/app/core/header/header.component.html
@@ -10,12 +10,12 @@
                 <li routerLinkActive="active"><a routerLink="/shopping-list">Shopping List</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-                <ng-template [ngIf]="!authService.isAuthenticated()">
+                <ng-template [ngIf]="!isAuthenticated()">
                     <li><a routerLink="/signup">Register</a></li>
                     <li><a routerLink="/signin">Login</a></li>
                 </ng-template>
-                <li><a style="cursor: pointer;" (click)="onLogout()" *ngIf="authService.isAuthenticated()">Logout</a></li>
-                <li class="dropdown" appDropdown *ngIf="authService.isAuthenticated()">
+                <li><a style="cursor: pointer;" (click)="onLogout()" *ngIf="isAuthenticated()">Logout</a></li>
+                <li class="dropdown" appDropdown *ngIf="isAuthenticated()">
                     <a style="cursor: pointer;" class="dropdown-toggle" role="button">Manage <span class="caret"></span></a>
                     <ul class="dropdown-menu">
                         <li><a style="cursor: pointer;" (click)="onSaveData()">Save</a></li>
diff --git a/src/app/core/header/header.component.ts b/src/app/core/header/header.component.ts
index e846498..5f519bc 100644
--- a/src/app/core/header/header.component.ts
+++ b/src/app/core/header/header.component.ts
@@ -25,4 +25,8 @@ export class HeaderComponent {
     onLogout() {
         this.authService.logout();
     }
+
+    isAuthenticated() {
+        return this.authService.isAuthenticated();
+    }
 }
\ No newline at end of file
diff --git a/src/app/recipes/recipe-edit/recipe-edit.component.html b/src/app/recipes/recipe-edit/recipe-edit.component.html
index 56bf343..ae91233 100644
--- a/src/app/recipes/recipe-edit/recipe-edit.component.html
+++ b/src/app/recipes/recipe-edit/recipe-edit.component.html
@@ -60,7 +60,7 @@
         <div class="col-xs-12" formArrayName="ingredients">
           <div
             class="row"
-            *ngFor="let ingredientCtrl of recipeForm.get('ingredients').controls; let i = index"
+            *ngFor="let ingredientCtrl of getIngredientControls(); let i = index"
             [formGroupName]="i"
             style="margin-top: 10px;">
             <div class="col-xs-8">
diff --git a/src/app/recipes/recipe-edit/recipe-edit.component.ts b/src/app/recipes/recipe-edit/recipe-edit.component.ts
index 1467b0c..42d30f2 100644
--- a/src/app/recipes/recipe-edit/recipe-edit.component.ts
+++ b/src/app/recipes/recipe-edit/recipe-edit.component.ts
@@ -88,4 +88,9 @@ export class RecipeEditComponent implements OnInit {
       'ingredients': recipeIngredients
     });
   }
+
+  
+  getIngredientControls() {
+    return (<FormArray>this.recipeForm.get('ingredients')).controls;
+  }
 }
diff --git a/src/app/recipes/recipes-routing.module.ts b/src/app/recipes/recipes-routing.module.ts
index 434a295..a1bd09c 100644
--- a/src/app/recipes/recipes-routing.module.ts
+++ b/src/app/recipes/recipes-routing.module.ts
@@ -18,6 +18,9 @@ const recipesRoutes: Routes = [
 
 @NgModule({
     imports: [RouterModule.forChild(recipesRoutes)],
-    exports: [RouterModule]
+    exports: [RouterModule],
+    providers: [
+        AuthGuard        
+    ]
 })
 export class RecipesRoutingModule {}
\ No newline at end of file