diff --git a/public/less/main.less b/public/less/main.less
index 839eed66a..fdc910807 100644
--- a/public/less/main.less
+++ b/public/less/main.less
@@ -157,4 +157,8 @@ pre {
     white-space: pre-wrap; 
     word-wrap: break-word; 
     height: 120px;
+}
+
+.md-input-focused .no-float-label {
+    visibility: hidden;
 }
\ No newline at end of file
diff --git a/public/templates/agents-fim.html b/public/templates/agents-fim.html
index 8b39bff45..0df5e59e6 100644
--- a/public/templates/agents-fim.html
+++ b/public/templates/agents-fim.html
@@ -1,186 +1,93 @@
 <md-content ng-if="submenuNavItem == 'fim'" ng-show="_agent" class="md-padding">
-	<div ng-controller="fimController">
+    <div ng-controller="fimController">
 
 
-<div flex layout="column">
+        <div flex layout="column">
 
-    <div flex layout="row" ng-if="!load">
-        <md-content flex id="content" layout="column" layout-padding>
-            <md-toolbar layout="row" class="md-primary _md" ng-if="_agent">
-                <div class="md-toolbar-tools" layout-align="space-between center">
-                    <h3><span ng-click="unsetFile()">{{_agent.id}} - {{_agent.name}}  <span ng-show="_agent.id == '000'">(Manager)</span></span> <span ng-if="_file"> > {{_file.file}}</span></h3>
-                    <h4 ng-if="!_file" hide-sm hide-xs>
-                        <span ng-click="startfim()"><i class="fa fa-refresh" aria-hidden="true"></i></span>
-                        <md-divider style="visibility: hidden;"></md-divider>
-                        <span ng-click="cleandb()"><i class="fa fa-trash" aria-hidden="true"></i></span>
-                    </h4>
-                    <h4 ng-click="unsetFile()" ng-if="_file">Back <i class="fa fa-undo" aria-hidden="true"></i></h4>
-                </div>
-            </md-toolbar>
-            <md-input-container layout="row" class="sideNavBox" ng-if="_agent">
-                <label for="searchBox">Search</label>
-                <input type="text" id="searchBox" ng-model="$parent.$parent.search" ng-change="getFiles()" md-autofocus flex>
-                <md-icon md-font-icon="fa fa-cog" ng-click="showFilesFiltersDialog($event)" />
-            </md-input-container>
-            <div flex ng-if="!(_file)">
-              <md-virtual-repeat-container class="vertical-repeater" style="min-height: 600px;">
-                <md-toolbar layout="row" class="md-hue-3">
-                  <div class="md-toolbar-tools">
-                      <span flex="60">File name</span>
-                      <span flex="20" hide-sm hide-xs>Event</span>
-                      <span flex="20" hide-sm hide-xs>Date</span>
-                  </div>
-                </md-toolbar>
-                  <div md-virtual-repeat="file in filesObj" md-on-demand flex  layout-align="stretch">
-                    <md-list>
-                      <md-list-item  ng-click="initEvents(_agent, file)">
-                        <span flex="60">{{file.file.length > 58 ? file.file.substring(0, 55)+'...' : file.file}}</span>
-                        <span flex="20" hide-sm hide-xs>{{file.event.charAt(0).toUpperCase() + file.event.slice(1)}}</span>
-                        <span flex="20" hide-sm hide-xs>{{file.modificationDate}}</span>
-                      </md-list-item>
-                    </md-list>
-                      <md-divider></md-divider>
-                  </div>
-              </md-virtual-repeat-container>
-            </div>
-            <div flex ng-if="_file">
-                <md-virtual-repeat-container class="vertical-repeater" style="min-height: 400px;">
-                  <md-toolbar layout="row" class="md-hue-3">
-                      <div class="md-toolbar-tools" style="text-align: center;">
-                          <span flex="10">Event</span>
-                          <span flex show-sm show-xs> </span>
-                          <span flex="20">Date</span>
-                          <span flex="15" hide-sm hide-xs>User</span>
-                          <span flex="15" hide-sm hide-xs>Group</span>
-                          <span flex="20" hide-sm hide-xs>Permissions</span>
-                          <span flex="10" hide-sm hide-xs>Size</span>
-                          <span flex show-sm show-xs> </span>
-                          <span flex="10">Details</span>
-                      </div>
-                    </md-toolbar>
-                    <div md-virtual-repeat="event in eventsObj" md-on-demand flex>
-                      <md-list>
-                        <md-list-item style="text-align: center;">
-                          <span flex="10">{{event.event}}</span>
-                          <span flex show-sm show-xs> </span>
-                          <span flex="20">{{event.modificationDate}}</span>
-                          <span flex="15" hide-sm hide-xs>{{event.user}} (ID: {{event.uid}})</span>
-                          <span flex="15" hide-sm hide-xs>{{event.group}} (ID: {{event.gid}})</span>
-                          <span flex="20" hide-sm hide-xs>{{event.permissions}}</span>
-                          <span flex="10" hide-sm hide-xs>{{event.size}} bits</span>
-                          <span flex show-sm show-xs> </span>
-                          <span flex="10" ng-click="printEventInfo(event)"><span class="glyphicon glyphicon-plus"></span></span>
-                        </md-list-item>
-                      </md-list>
-                    </div>
-            </div>
-        </md-content>
+            <div flex layout="row" ng-if="!load">
+                <md-content flex layout="column">
 
-        <md-sidenav md-is-open="isOpenSidenav" md-component-id="agentsNav" md-is-locked-open="$mdMedia('gt-sm')" md-disable-backdrop
-            layout="column" class="md-sidenav-right md-whiteframe-z2">
-            <md-icon md-font-icon="fa fa-times" aria-label="close lateral menu" ng-click="isOpenSidenav = !isOpenSidenav" hide-gt-sm></md-icon>
-            <md-input-container class="sideNavBox">
-                <label for="searchBox">Search</label>
-                <input type="text" id="searchBox" ng-model="$parent.searchAgents" ng-change="searchAgent()" md-autofocus flex>
-                <md-icon md-font-icon="fa fa-cog" ng-click="showAgentsFiltersDialog($event)" />
-            </md-input-container>
-            <md-chips>
-                <md-chip ng-show="statusFilter">{{statusFilter}}</md-chip>
-                <md-chip ng-show="!statusFilter">all</md-chip>
-                <md-chip ng-show="sortKey">
-                    {{sortKey}}
-                    <span class="glyphicon sort-icon" ng-class="{'glyphicon-triangle-top':reverse,'glyphicon-triangle-bottom':!reverse}"></span>
-                </md-chip>
-            </md-chips>
-            <md-virtual-repeat-container class="vertical-repeater">
-                <div md-virtual-repeat="agent in agentsObj" md-on-demand flex>
-                    <div layout="column" layout-align="space-around stretch">
-                        <md-card ng-click="setAgentFilter(agent);">
-                            <md-card-title>
-                                <md-card-title-text>
-                                    <span class="md-title">{{agent.id}} <span ng-if="agent.id == '000'">(Manager)</span></span>
-                                    <span class="md-subhead">{{agent.name}} - {{agent.ip}}</span>
-                                </md-card-title-text>
-                                <div layout="column" class="status" ng-class="getAgentStatusClass(agent.status);">
-                                </div>
-                            </md-card-title>
-                        </md-card>
-                    </div>
-                </div>
-            </md-virtual-repeat-container>
-        </md-sidenav>
-        <md-button ng-show="!isOpenSidenav" class="md-icon-button md-primary" ng-click="isOpenSidenav = !isOpenSidenav" aria-label="Agents"
-            hide-gt-sm>
-            <span class="glyphicon glyphicon-menu-hamburger"></span>
-        </md-button>
-    </div>
-
-    <div style="display: none">
-        <div class="md-dialog-container" id="filtersAgentsDialog">
-            <md-dialog layout-padding layout="column" layout-align="space-around center">
-                <label>Filter by status:</label>
-                <md-input-container>
-                    <md-select ng-model="statusFilter" ng-change="agentStatusFilter()" aria-label="Filter by status">
-                        <md-option value="all">All</md-option>
-                        <md-option value="active">Active</md-option>
-                        <md-option value="disconnected">Disconnected</md-option>
-                        <md-option value="never connected">Never connected</md-option>
-                    </md-select>
+                    <div flex ng-if="!(_file)">
+                        <md-virtual-repeat-container class="vertical-repeater">
+                            <md-toolbar layout="row" class="md-hue-3">
+                                <div class="md-toolbar-tools">
+                                    <span flex="60">
+                          <md-input-container style="width: 80%">
+                <label for="searchBox" class="no-float-label">File name</label>
+                <input type="text" id="searchBox" ng-model="_fimSearch" ng-change="getFiles()" md-autofocus flex>
                 </md-input-container>
-                <label>Order by:</label>
-                <div flex layout="row" layout-align="space-around center" md-disable-backdrop class="md-padding">
-                    <md-button class="md-primary" ng-click="sort('status')">
-                        <span>Status</span>
-                        <span class="glyphicon sort-icon" ng-show="sortKey=='status'" ng-class="{'glyphicon-triangle-top':reverse,'glyphicon-triangle-bottom':!reverse}"></span>
-                        <span class="glyphicon sort-icon glyphicon-minus" ng-show="sortKey!='status'"></span>
-                    </md-button>
-                    <md-button class="md-primary" ng-click="sort('ip')">
-                        <span>IP</span>
-                        <span class="glyphicon sort-icon" ng-show="sortKey=='ip'" ng-class="{'glyphicon-triangle-top':reverse,'glyphicon-triangle-bottom':!reverse}"></span>
-                        <span class="glyphicon sort-icon glyphicon-minus" ng-show="sortKey!='ip'"></span>
-                    </md-button>
-                    <md-button class="md-primary" ng-click="sort('name')">
-                        <span>Name</span>
-                        <span class="glyphicon sort-icon" ng-show="sortKey=='name'" ng-class="{'glyphicon-triangle-top':reverse,'glyphicon-triangle-bottom':!reverse}"></span>
-                        <span class="glyphicon sort-icon glyphicon-minus" ng-show="sortKey!='name'"></span>
-                    </md-button>
-                    <md-button class="md-primary" ng-click="sort('id')">
-                        <span>ID</span>
-                        <span class="glyphicon sort-icon" ng-show="sortKey=='id'" ng-class="{'glyphicon-triangle-top':reverse,'glyphicon-triangle-bottom':!reverse}"></span>
-                        <span class="glyphicon sort-icon glyphicon-minus" ng-show="sortKey!='id'"></span>
-                    </md-button>
-                </div>
-            </md-dialog>
-        </div>
-    </div>
-
-    <div style="display: none">
-        <div class="md-dialog-container" id="filtersFilesDialog">
-            <md-dialog layout-padding layout="column" layout-align="space-around center">
-                <label>Filter by event:</label>
-                <md-input-container>
-                    <md-select ng-model="eventFilter" ng-change="setEventFilter()" aria-label="Filter by event">
-                        <md-option value="all">All</md-option>
+                      </span>
+                                    <span flex="20" hide-sm hide-xs>
+                                                    <md-input-container style="width: 80%">
+                          <md-select id="eventBox" ng-model="_fimEvent" ng-change="setEventFilter()" aria-label="Filter by event">
+                        <md-option value="all">All events</md-option>
                         <md-option value="added">Added</md-option>
                         <md-option value="modified">Modified</md-option>
                         <md-option value="readded">Re-added</md-option>
-                        <md-option value="">Deleted</md-option>
+                        <md-option value="deleted">Deleted</md-option>
                     </md-select>
-                </md-input-container>
-                <label>Filter by type:</label>
-                <md-input-container>
-                    <md-select ng-model="typeFilter" ng-change="setTypeFilter()" aria-label="Filter by type">
-                        <md-option value="all">All</md-option>
-                        <md-option value="file">File</md-option>
-                        <md-option value="registry">Registry</md-option>
+                                                    </md-input-container>
+                      </span>
+                                    <span flex="20" hide-sm hide-xs>
+                           <md-input-container style="width: 80%">
+                               <md-select id="typeBox" ng-model="_fimType" ng-change="setTypeFilter()" aria-label="Filter by type">
+                        <md-option value="all">All elements</md-option>
+                        <md-option value="file">Files</md-option>
+                        <md-option value="registry">Registry entries</md-option>
                     </md-select>
-                </md-input-container>
-            </md-dialog>
+                           </md-input-container>
+                      </span>
+                                </div>
+                            </md-toolbar>
+                            <div md-virtual-repeat="file in filesObj" md-on-demand flex layout-align="stretch">
+                                <md-list>
+                                    <md-list-item ng-click="initEvents(_agent, file)">
+                                        <span flex="60">{{file.file.length > 75 ? file.file.substring(0, 75)+'...' : file.file}}</span>
+                                        <span flex="20" hide-sm hide-xs>{{file.event.charAt(0).toUpperCase() + file.event.slice(1)}}</span>
+                                        <span flex="20" hide-sm hide-xs>{{file.modificationDate}}</span>
+                                    </md-list-item>
+                                </md-list>
+                                <md-divider></md-divider>
+                            </div>
+                        </md-virtual-repeat-container>
+                    </div>
+
+
+                    <!--todo-->
+                    <div flex ng-if="_file">
+                        <md-virtual-repeat-container class="vertical-repeater" style="min-height: 400px;">
+                            <md-toolbar layout="row" class="md-hue-3">
+                                <div class="md-toolbar-tools" style="text-align: center;">
+                                    <span flex="10">Event</span>
+                                    <span flex show-sm show-xs> </span>
+                                    <span flex="20">Date</span>
+                                    <span flex="15" hide-sm hide-xs>User</span>
+                                    <span flex="15" hide-sm hide-xs>Group</span>
+                                    <span flex="20" hide-sm hide-xs>Permissions</span>
+                                    <span flex="10" hide-sm hide-xs>Size</span>
+                                    <span flex show-sm show-xs> </span>
+                                    <span flex="10">Details</span>
+                                </div>
+                            </md-toolbar>
+                            <div md-virtual-repeat="event in eventsObj" md-on-demand flex>
+                                <md-list>
+                                    <md-list-item style="text-align: center;">
+                                        <span flex="10">{{event.event}}</span>
+                                        <span flex show-sm show-xs> </span>
+                                        <span flex="20">{{event.modificationDate}}</span>
+                                        <span flex="15" hide-sm hide-xs>{{event.user}} (ID: {{event.uid}})</span>
+                                        <span flex="15" hide-sm hide-xs>{{event.group}} (ID: {{event.gid}})</span>
+                                        <span flex="20" hide-sm hide-xs>{{event.permissions}}</span>
+                                        <span flex="10" hide-sm hide-xs>{{event.size}} bits</span>
+                                        <span flex show-sm show-xs> </span>
+                                        <span flex="10" ng-click="printEventInfo(event)"><span class="glyphicon glyphicon-plus"></span></span>
+                                    </md-list-item>
+                                </md-list>
+                            </div>
+                    </div>
+                </md-content>
+            </div>
+
+
         </div>
-    </div>
-
-</div>
-
-
-	</div>
 </md-content>
\ No newline at end of file