diff --git a/web/src/components/Charts/AccessPointClientsChart.vue b/web/src/components/Charts/AccessPointClientsChart.vue
index 3f373dd..89f2003 100644
--- a/web/src/components/Charts/AccessPointClientsChart.vue
+++ b/web/src/components/Charts/AccessPointClientsChart.vue
@@ -44,7 +44,7 @@ export default {
     },
     height: {
       type: Number,
-      default: 250
+      default: 200
     },
     cssClasses: {
       default: '',
diff --git a/web/src/components/Charts/AccessPointSignalStrengthChart.vue b/web/src/components/Charts/AccessPointSignalStrengthChart.vue
index 1a7ff4a..b63f698 100644
--- a/web/src/components/Charts/AccessPointSignalStrengthChart.vue
+++ b/web/src/components/Charts/AccessPointSignalStrengthChart.vue
@@ -61,7 +61,7 @@ export default {
     },
     height: {
       type: Number,
-      default: 250
+      default: 200
     },
     cssClasses: {
       default: '',
diff --git a/web/src/components/NavList.vue b/web/src/components/NavList.vue
index e1b210a..081cd00 100755
--- a/web/src/components/NavList.vue
+++ b/web/src/components/NavList.vue
@@ -73,7 +73,7 @@ export default {
   methods: {
     shouldShowGroup({ items }) {
       return items.some(item =>
-        this.$route.matched.some(route => route.name === item.route.name)
+        this.$route.matched.some(route => route.name == item.route.name)
       )
     }
   }
diff --git a/web/src/router/index.js b/web/src/router/index.js
index 9eec9d7..55fd53c 100755
--- a/web/src/router/index.js
+++ b/web/src/router/index.js
@@ -193,18 +193,6 @@ const routes = [
         /* webpackChunkName: "access-points" */ '../views/AccessPoints/index.vue'
       ),
     children: [
-      {
-        path: ':id/clients',
-        name: 'access-point-clients',
-        meta: {
-          title: 'Clientes conectados',
-          roles: ['superAdmin']
-        },
-        component: () =>
-          import(
-            /* webpackChunkName: "access-point-clients" */ '../views/AccessPoints/clients.vue'
-          )
-      },
       {
         path: ':id/edit',
         name: 'access-point-edit',
@@ -220,6 +208,19 @@ const routes = [
     ]
   },
 
+  {
+    path: '/access-points/:id/clients',
+    name: 'access-point-clients',
+    meta: {
+      title: 'Clientes conectados',
+      roles: ['superAdmin']
+    },
+    component: () =>
+      import(
+        /* webpackChunkName: "access-point-clients" */ '../views/AccessPoints/clients.vue'
+      )
+  },
+
   {
     path: '/wifi-users',
     name: 'wifi-users',
diff --git a/web/src/views/AccessPoints/clients.vue b/web/src/views/AccessPoints/clients.vue
index fd26519..ba6a899 100644
--- a/web/src/views/AccessPoints/clients.vue
+++ b/web/src/views/AccessPoints/clients.vue
@@ -1,79 +1,66 @@
 <template>
   <div>
-    <v-dialog
-      v-model="showDialog"
-      fullscreen
-      transition="dialog-bottom-transition"
-      scrollable
-    >
-      <v-card v-if="!accessPoint">
-        <v-skeleton-loader
-          type="table-heading, list-item-two-line, image, table-tfoot"
+    <v-card v-if="!accessPoint">
+      <v-skeleton-loader
+        type="table-heading, list-item-two-line, image, table-tfoot"
+      />
+    </v-card>
+
+    <v-card v-else :loading="!accessPoint">
+      <v-card-title class="font-weight-regular">
+        <v-btn class="ml-1" icon @click="() => $router.back()">
+          <v-icon>mdi-arrow-left</v-icon>
+        </v-btn>
+        <div>
+          <ApIcon class="mr-2" :controller="accessPoint.controller" />
+          {{ accessPoint.name || accessPoint.hostname }}
+          <small> ({{ accessPoint.ip }}) </small>
+          <small v-if="accessPoint.local" class="font-weight-light">
+            <v-divider />
+            {{ accessPoint.local }}
+          </small>
+          <br />
+        </div>
+        <v-spacer />
+        <v-text-field
+          v-model="filter"
+          label="Filtro"
+          prepend-inner-icon="mdi-magnify"
+          single-line
+          hide-details
+          style="max-width: 350px"
+          outlined
+          dense
         />
-      </v-card>
+      </v-card-title>
+      <v-divider />
 
-      <v-card v-else :loading="!accessPoint">
-        <v-card-title class="font-weight-regular">
-          <div>
-            <ApIcon class="mr-2" :controller="accessPoint.controller" />
-            {{ accessPoint.name || accessPoint.hostname }}
-            <small> ({{ accessPoint.ip }}) </small>
-            <small v-if="accessPoint.local" class="font-weight-light">
-              <v-divider />
-              {{ accessPoint.local }}
-            </small>
-          </div>
-          <v-spacer />
-          <v-text-field
-            v-model="filter"
-            label="Filtro"
-            prepend-inner-icon="mdi-magnify"
-            single-line
-            hide-details
-            style="max-width: 350px"
-            outlined
-            dense
-          />
-
-          <v-btn class="ml-1" icon @click="showDialog = false">
-            <v-icon>mdi-close</v-icon>
-          </v-btn>
-        </v-card-title>
+      <v-card-text>
+        <v-container fluid>
+          <v-row>
+            <v-col :md="6">
+              <AccessPointClientsChart
+                :chart-id="`ap-clients-chart-${accessPoint.id}`"
+                :stats="accessPoint.stats"
+              />
+            </v-col>
+            <v-col :md="6">
+              <AccessPointSignalStrengthChart
+                :chart-id="`ap-signal-chart-${accessPoint.id}`"
+                :stats="accessPoint.stats"
+              />
+            </v-col>
+          </v-row>
+        </v-container>
         <v-divider />
-        <v-card-text>
-          <v-container fluid>
-            <v-row>
-              <v-col :md="6">
-                <AccessPointClientsChart
-                  :chart-id="`ap-clients-chart-${accessPoint.id}`"
-                  :stats="accessPoint.stats"
-                />
-              </v-col>
-              <v-col :md="6">
-                <AccessPointSignalStrengthChart
-                  :chart-id="`ap-signal-chart-${accessPoint.id}`"
-                  :stats="accessPoint.stats"
-                />
-              </v-col>
-            </v-row>
-          </v-container>
-          <v-divider />
-          <AccessPointClientsDataTable
-            :wifi-devices="accessPoint.wifiDevices"
-            :filter="filter"
-          />
-        </v-card-text>
-        <v-divider />
-        <v-card-actions>
-          <v-icon small left>mdi-account-group</v-icon>
-          {{ accessPoint.wifiDevices.length }} clientes conectados
-          <v-spacer />
-          <v-btn color="primary" text @click="showDialog = false">
-            Voltar
-          </v-btn>
-        </v-card-actions>
-      </v-card>
-    </v-dialog>
+        <AccessPointClientsDataTable
+          :wifi-devices="accessPoint.wifiDevices"
+          :filter="filter"
+          paginate
+        />
+      </v-card-text>
+      <v-divider />
+    </v-card>
   </div>
 </template>
 
@@ -94,15 +81,9 @@ export default {
     AccessPointSignalStrengthChart
   },
   data: () => ({
-    showDialog: true,
     filter: ''
   }),
-  watch: {
-    showDialog() {
-      this.filter = ''
-      this.$router.back()
-    }
-  },
+  watch: {},
 
   apollo: {
     accessPoint: {