diff --git a/README.md b/README.md
index 43af6fb..ff325e0 100644
--- a/README.md
+++ b/README.md
@@ -79,10 +79,24 @@ sensor registrations, management of decoding protocols and dispatching to adequa
 
 - [Install D4 Server](https://github.com/D4-project/d4-core/tree/master/server)
 
-### Screenshots of D4 core server management
+### D4 core server Screenshots
 
+#### Dashboard
 ![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/main.png)
+
+#### Connected Sensors
 ![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor-mgmt.png)
-![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-mgmt.png)
+
+#### Sensors Status
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor_status.png)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor_stat_types.png)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor_stat_files.png)
+
+#### Server Management
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-management.png)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-management-type.png)
+
+#### analyzer Queues
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/analyzer-queues)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/create_analyzer_queue.png)
 ![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/analyzer-mgmt.png)
-![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-mgmt2.png)
diff --git a/doc/images/analyzer-queues.png b/doc/images/analyzer-queues.png
new file mode 100644
index 0000000..a946281
Binary files /dev/null and b/doc/images/analyzer-queues.png differ
diff --git a/doc/images/server-management-types.png.png b/doc/images/server-management-types.png.png
new file mode 100644
index 0000000..273ca82
Binary files /dev/null and b/doc/images/server-management-types.png.png differ
diff --git a/doc/images/server-management.png b/doc/images/server-management.png
index c0ba617..5b374f2 100644
Binary files a/doc/images/server-management.png and b/doc/images/server-management.png differ
diff --git a/server/README.md b/server/README.md
index b6cf622..2268112 100644
--- a/server/README.md
+++ b/server/README.md
@@ -52,13 +52,27 @@ cd web
 - All server logs are located in ``d4-core/server/logs/``
 - Close D4 Server: ``./LAUNCH.sh -k``
 
-### Screenshots of D4 core server management
+### D4 core server
 
+#### Dashboard
 ![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/main.png)
+
+#### Connected Sensors
 ![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor-mgmt.png)
-![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-mgmt.png)
+
+#### Sensors Status
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor_status.png)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor_stat_types.png)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/sensor_stat_files.png)
+
+#### Server Management
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-management.png)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-management-type.png)
+
+#### analyzer Queues
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/analyzer-queues)
+![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/create_analyzer_queue.png)
 ![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/analyzer-mgmt.png)
-![](https://raw.githubusercontent.com/D4-project/d4-core/master/doc/images/server-mgmt2.png)
 
 ### Troubleshooting