diff --git a/src/components/readmoore/readmore.component.ts b/src/components/readmoore/readmore.component.ts
index dcab005e2021a43a400a6289395339dec83a75a5..9224ca5a9caa4641ddbb03d3c88ad3392461c68c 100644
--- a/src/components/readmoore/readmore.component.ts
+++ b/src/components/readmoore/readmore.component.ts
@@ -17,7 +17,7 @@ export class ReadmoreComponent implements OnChanges{
     
   }
 
-  private toggle(event:MouseEvent){
+  public toggle(event:MouseEvent){
     this.show = !this.show
     event.stopPropagation()
     event.preventDefault()
diff --git a/src/examples/examples.component.ts b/src/examples/examples.component.ts
deleted file mode 100644
index b98cc7377852c7560e6cea4d5ceefdf7b68a046c..0000000000000000000000000000000000000000
--- a/src/examples/examples.component.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-import { Component } from "@angular/core";
-
-@Component({
-  selector : `examples`,
-  templateUrl : './examples.template.html',
-  styleUrls : [
-    `./examples.style.css`
-  ]
-})
-
-export class Examples{
-  
-}
\ No newline at end of file
diff --git a/src/examples/examples.style.css b/src/examples/examples.style.css
deleted file mode 100644
index e2493ee14170a16160baafb160ac185a9c3b21e0..0000000000000000000000000000000000000000
--- a/src/examples/examples.style.css
+++ /dev/null
@@ -1,4 +0,0 @@
-layouts-example
-{
-  width:100%;
-}
\ No newline at end of file
diff --git a/src/examples/examples.template.html b/src/examples/examples.template.html
deleted file mode 100644
index c3a802cb4d07ecb8a76db055b630552550ba4e2b..0000000000000000000000000000000000000000
--- a/src/examples/examples.template.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<layouts-example>
-  
-</layouts-example>
\ No newline at end of file
diff --git a/src/main-aot.ts b/src/main-aot.ts
index 41d70208e9ad70eaa2a23333dbe831bb9997d174..8e71149acdd48b969b932ecdc8b2e9b1501dfa58 100644
--- a/src/main-aot.ts
+++ b/src/main-aot.ts
@@ -1,5 +1,6 @@
 import 'zone.js'
-import { ComponentsModule } from './components/components.module'
+
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic'
+import { MainModule } from './main.module';
 
-platformBrowserDynamic().bootstrapModule(ComponentsModule)
\ No newline at end of file
+platformBrowserDynamic().bootstrapModule(MainModule)
\ No newline at end of file
diff --git a/src/main.module.ts b/src/main.module.ts
index 25ea9cd05f59f6da45c48b5e8cecdb7e765ca85e..cfa7c2680a32241cb3171243c9745cb48c80a151 100644
--- a/src/main.module.ts
+++ b/src/main.module.ts
@@ -22,6 +22,7 @@ import { ModalUnit } from "./atlasViewer/modalUnit/modalUnit.component";
 import { AtlasViewerURLService } from "./atlasViewer/atlasViewer.urlService.service";
 import { ToastComponent } from "./components/toast/toast.component";
 import { GetFilenameFromPathnamePipe } from "./util/pipes/getFileNameFromPathName.pipe";
+import { FilterNameBySearch } from "./util/pipes/filterNameBySearch.pipe";
 
 @NgModule({
   imports : [
@@ -59,7 +60,8 @@ import { GetFilenameFromPathnamePipe } from "./util/pipes/getFileNameFromPathNam
     /* pipes */
     GetNamesPipe,
     GetNamePipe,
-    GetFilenameFromPathnamePipe
+    GetFilenameFromPathnamePipe,
+    FilterNameBySearch
   ],
   entryComponents : [
     WidgetUnit,
diff --git a/src/services/stateStore.service.ts b/src/services/stateStore.service.ts
index a641dae9a8c707c4a7c9a63eceebff75055a2dda..421aa33b821d40685133abc5a3eae4e283b045c2 100644
--- a/src/services/stateStore.service.ts
+++ b/src/services/stateStore.service.ts
@@ -239,6 +239,7 @@ export interface File{
   url? : string
   data? : any
   targetParcellation : string
+  properties : any
 }
 
 export interface Property{
diff --git a/src/ui/ui.module.ts b/src/ui/ui.module.ts
index 5f573aded69767dae759c6ff0331ceb49fbe711b..15f0e02678b32abaaf4b083fb57d58fdcbd922a5 100644
--- a/src/ui/ui.module.ts
+++ b/src/ui/ui.module.ts
@@ -50,7 +50,8 @@ import { SafeStylePipe } from "../util/pipes/safeStyle.pipe";
     CopyPropertyPipe,
     GetUniqueProperty,
     FilterDataEntriesbyType,
-    SafeStylePipe
+    SafeStylePipe,
+    
   ],
   entryComponents : [
 
diff --git a/src/util/pipes/filterDataEntries.pipe.ts b/src/util/pipes/filterDataEntries.pipe.ts
deleted file mode 100644
index 252b4611cb97bd27dd2483be4c935b378bc3e912..0000000000000000000000000000000000000000
--- a/src/util/pipes/filterDataEntries.pipe.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-import { Pipe, PipeTransform } from "@angular/core";
-import { DataEntry } from "../../services/stateStore.service";
-
-@Pipe({
-  name : 'filterDatasetSearchResult'
-})
-
-export class FilterDatasetSearchResult implements PipeTransform{
-  public transform(datasets:DataEntry[],filterArr:{name:string,enabled:boolean}[]):DataEntry[]{
-    return datasets.filter(dataset=>{
-      const filter = filterArr.find(obj=>obj.name == dataset.type)
-      return filter ? filter.enabled : false
-    })
-  }
-}
\ No newline at end of file
diff --git a/webpack.aot.js b/webpack.aot.js
index c5793af9c2efdeb21bf2f18821e18b19e9aaf2bc..0b141cc0041ffbf2a164cfbdbc2e5a2ad09481e2 100644
--- a/webpack.aot.js
+++ b/webpack.aot.js
@@ -8,7 +8,6 @@ const ClosureCompilerPlugin = require('webpack-closure-compiler')
 module.exports = {
 
   entry : './src/main-aot.ts',
-  mode : "development",
   output : {
     filename : 'main.js',
     path : path.resolve(__dirname,'dist/aot')
@@ -24,15 +23,6 @@ module.exports = {
           }
         }
       },
-      {
-        test : /export_nehuba.*?.css$/,
-        use : {
-          loader : 'file-loader',
-          options: {
-            name : '[name].[ext]'
-          }
-        }
-      },
       {
         test: /(?:\.ngfactory\.js|\.ngstyle\.js|\.ts)$/,
         // test : /\.ts$/,
@@ -49,18 +39,12 @@ module.exports = {
     ]
   },
   plugins : [
-    new ClosureCompilerPlugin({
-      compiler : {
-        compilation_level : 'whitespace_only'
-      },
-      concurrency : 4
-    }),
     new HtmlWebpackPlugin({
       template : 'src/index.html'
     }),
     new AngularCompilerPlugin({
       tsConfigPath: 'tsconfig-aot.json',
-      entryModule: 'src/components/components.module#ComponentsModule'
+      entryModule: 'src/main.module#MainModule'
     })
   ],
   resolve : {
diff --git a/webpack.prod.js b/webpack.prod.js
index 9bbb1caeb613e666635bffdc5c94f2703e411130..87339cbca0a212f635bc58508c79a7fa4b132bad 100644
--- a/webpack.prod.js
+++ b/webpack.prod.js
@@ -3,9 +3,9 @@ const merge = require('webpack-merge')
 const Uglify = require('uglifyjs-webpack-plugin')
 const path = require('path')
 const ClosureCompilerPlugin = require('webpack-closure-compiler')
+const ngAssets = require('./webpack.ngassets')
 
-module.exports = merge(common,{
-  mode : 'production',
+module.exports = merge(common,ngAssets,{
   entry : './src/main.ts',
   output : {
     filename : 'main.js',