diff --git a/frontend/public/base.gohtml b/frontend/public/base.gohtml
index e74795c4..c29adfcf 100644
--- a/frontend/public/base.gohtml
+++ b/frontend/public/base.gohtml
@@ -30,7 +30,7 @@
     <strong>We're sorry but Statping doesn't work properly without JavaScript enabled. Please enable it to continue.</strong>
 </noscript>
 
-<div id="app"></div>
+<div id="app" class="statping_container"></div>
 
 {{if USE_CDN}}
 <script src="https://assets.statping.com/js/bundle.js"></script>
diff --git a/frontend/src/assets/scss/base.scss b/frontend/src/assets/scss/base.scss
index 7ff91434..97c4883b 100644
--- a/frontend/src/assets/scss/base.scss
+++ b/frontend/src/assets/scss/base.scss
@@ -3,566 +3,600 @@
 
 HTML,BODY {
     background-color: $background-color;
-    padding-bottom: 10px;
 }
 
-.container {
+.contain-card {
+
+  .card-header {
+    font-size: 1.15rem;
+  }
+
+  .dropdown-menu {
+    background-color: rgba(239, 239, 239, 0.65);
+  }
+
+}
+
+.dropup .dropdown-menu {
+    border-radius: 8px 8px 8px 0;
+    background-color: #efefef;
+}
+
+  .service_scale {
+    width: 60pt;
+    float: left !important;
+    margin-right: 12pt;
+  }
+
+  .slide-fade-enter-active {
+    transition: all .5s ease;
+  }
+  .slide-fade-leave-active {
+    transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
+  }
+  .slide-fade-enter, .slide-fade-leave-to
+    /* .slide-fade-leave-active below version 2.1.8 */ {
+    transform: translateX(10px);
+    opacity: 0;
+  }
+
+  .container {
     padding-top: 20px;
     padding-bottom: 25px;
     max-width: $max-width;
     box-shadow: 0 .5rem 1rem rgba(0,0,0,.15)!important;
-}
+  }
 
-.header-title {
+  .header-title {
     color: $title-color;
-}
+  }
 
-.header-desc {
+  .header-desc {
     color: $description-color;
-}
+  }
 
-.btn {
+  .btn {
     border-radius: $global-border-radius;
-}
+  }
 
-.online_list .badge {
+  .online_list .badge {
     margin-top: 0.2rem;
-}
+  }
 
-.navbar {
+  .navbar {
     margin-bottom: 30px;
-}
+  }
 
-.btn-sm {
+  .btn-sm {
     line-height: 1.3;
     font-size: 0.75rem;
-}
+  }
 
-.view_service_btn {
+  .view_service_btn {
     position: absolute;
     bottom: -40px;
     right: 40px;
-}
+  }
 
-.service_lower_info {
+  .service_lower_info {
     position: absolute;
     bottom: -40px;
     left: 40px;
     color: #d1ffca;
     font-size: 0.85rem;
-}
+  }
 
-.lg_number {
+  .lg_number {
     font-size: $service-stats-size;
     font-weight: bold;
     display: block;
     color: $service-stats-color;
-}
+  }
 
-.stats_area {
+  .stats_area {
     text-align: center;
     color: #a5a5a5;
-}
+  }
 
-.lower_canvas {
+  .lower_canvas {
     height: 3.4rem;
     width: 100%;
     padding: 15px 10px;
     margin-left: 0px !important;
     margin-right: 0px !important;
-}
+  }
 
-.lower_canvas SPAN {
+  .lower_canvas SPAN {
     font-size: 1rem;
     color: $service-description-color
-}
+  }
 
-.footer {
+  .footer {
     text-decoration: none;
     margin-top: 20px;
-}
+  }
 
-.footer A {
+  .footer A {
     color: $footer-text-color;
     text-decoration: none;
-}
+  }
 
-.footer A:HOVER {
+  .footer A:HOVER {
     color: #6d6d6d;
-}
+  }
 
-.font-0 {
+  .font-0 {
     font-size: 5pt;
-}
+  }
 
-.font-1 {
+  .font-1 {
     font-size: 7pt;
-}
+  }
 
-.font-2 {
+  .font-2 {
     font-size: 9pt;
-}
+  }
 
-.font-3 {
+  .font-3 {
     font-size: 11pt;
-}
+  }
 
-.badge {
+  .badge {
     color: white;
     border-radius: $global-border-radius;
-}
+  }
 
-.btn-group {
+  .btn-group {
     height: 25px;
 
     & A {
-        padding: 0.1rem .75rem;
-        font-size: 0.8rem;
+      padding: 0.1rem .75rem;
+      font-size: 0.8rem;
     }
-}
+  }
 
-.card-body .badge {
+  .card-body .badge {
     color: #fff;
-}
+  }
 
-.nav-pills .nav-link {
+  .nav-pills .nav-link {
     border-radius: $global-border-radius;
-}
+  }
 
-.form-control {
+  .form-control {
     border-radius: $global-border-radius;
-}
+  }
 
-.mini_success {
-  background-color: #f3f3f3;
-}
+  .mini_success {
+    background-color: #f3f3f3;
+  }
 
-.no-decoration {
-  color: black;
-  text-decoration: none;
-}
+  .no-decoration {
+    color: black;
+    text-decoration: none;
+  }
 
-.no-decoration:HOVER {
-  color: #2b2b2b;
-  text-decoration: none;
-}
+  .no-decoration:HOVER {
+    color: #2b2b2b;
+    text-decoration: none;
+  }
 
-.mini_error {
-  background-color: #ffbbbb;
-}
+  .mini_error {
+    background-color: #ffbbbb;
+  }
 
-.card {
+  .card {
     background-color: $service-background;
     border: $service-border;
-}
+  }
 
-.card-body {
+  .card-body {
     overflow: hidden;
-}
+  }
 
-.card-body H4 A {
+  .card-body H4 A {
     color: $service-title;
     text-decoration: none;
-}
+  }
 
-.card-title A {
-  color: $service-title;
-  text-decoration: none;
-}
+  .card-title A {
+    color: $service-title;
+    text-decoration: none;
+  }
 
-.chart-container {
-  position: relative;
-  height: 24.1vh;
-  width: 100%;
-  overflow: hidden;
-}
+  .chart-container {
+    position: relative;
+    height: 24.1vh;
+    width: 100%;
+    overflow: hidden;
+  }
 
-.service-chart-container {
-  position: relative;
-  height: 400px;
-  width: 100%;
-}
+  .service-chart-container {
+    position: relative;
+    height: 400px;
+    width: 100%;
+  }
 
-.service-chart-heatmap {
-  position: relative;
-  height: 300px;
-  width: 100%;
-}
+  .service-chart-heatmap {
+    position: relative;
+    height: 300px;
+    width: 100%;
+  }
 
-.inputTags-field {
-  border: 0;
-  background-color: transparent;
-  padding-top: .13rem;
-}
+  .inputTags-field {
+    border: 0;
+    background-color: transparent;
+    padding-top: .13rem;
+  }
 
-input.inputTags-field:focus {
-  outline-width: 0;
-}
+  input.inputTags-field:focus {
+    outline-width: 0;
+  }
 
-.inputTags-list {
-  display: block;
-  width: 100%;
-  min-height: calc(2.25rem + 2px);
-  padding: .2rem .35rem;
-  font-size: 1rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #495057;
-  background-color: #fff;
-  background-clip: padding-box;
-  border: 1px solid #ced4da;
-  border-radius: .25rem;
-  transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
-}
+  .inputTags-list {
+    display: block;
+    width: 100%;
+    min-height: calc(2.25rem + 2px);
+    padding: .2rem .35rem;
+    font-size: 1rem;
+    font-weight: 400;
+    line-height: 1.5;
+    color: #495057;
+    background-color: #fff;
+    background-clip: padding-box;
+    border: 1px solid #ced4da;
+    border-radius: .25rem;
+    transition: border-color .15s ease-in-out,box-shadow .15s ease-in-out;
+  }
 
-.inputTags-item {
-  background-color: #3aba39;
-  margin-right: 5px;
-  padding: 5px 8px;
-  font-size: 10pt;
-  color: white;
-  border-radius: 4px;
-}
+  .inputTags-item {
+    background-color: #3aba39;
+    margin-right: 5px;
+    padding: 5px 8px;
+    font-size: 10pt;
+    color: white;
+    border-radius: 4px;
+  }
 
-.inputTags-item .close-item {
-  margin-left: 6px;
-  font-size: 13pt;
-  font-weight: bold;
-  cursor: pointer;
-}
+  .inputTags-item .close-item {
+    margin-left: 6px;
+    font-size: 13pt;
+    font-weight: bold;
+    cursor: pointer;
+  }
 
-@mixin dynamic-color-hov($color) {
+  @mixin dynamic-color-hov($color) {
     &.dyn-dark {
-        background-color: darken($color, 12%) !important;
-        border-color: darken($color, 17%) !important;
+      background-color: darken($color, 12%) !important;
+      border-color: darken($color, 17%) !important;
     }
     &.dyn-dark:HOVER {
-        background-color: darken($color, 17%) !important;
-        border-color: darken($color, 20%) !important;
+      background-color: darken($color, 17%) !important;
+      border-color: darken($color, 20%) !important;
     }
     &.dyn-light {
-        background-color: lighten($color, 12%) !important;
-        border-color: lighten($color, 17%) !important;
+      background-color: lighten($color, 12%) !important;
+      border-color: lighten($color, 17%) !important;
     }
     &.dyn-light:HOVER {
-        background-color: lighten($color, 17%) !important;
-        border-color: lighten($color, 20%) !important;
+      background-color: lighten($color, 17%) !important;
+      border-color: lighten($color, 20%) !important;
     }
-}
+  }
 
-@mixin dynamic-color($color) {
+  @mixin dynamic-color($color) {
     &.dyn-dark {
-        background-color: darken($color, 12%) !important;
-        border-color: darken($color, 17%) !important;
+      background-color: darken($color, 12%) !important;
+      border-color: darken($color, 17%) !important;
     }
     &.dyn-light {
-        background-color: lighten($color, 12%) !important;
-        border-color: lighten($color, 17%) !important;
+      background-color: lighten($color, 12%) !important;
+      border-color: lighten($color, 17%) !important;
     }
-}
+  }
 
 
-.btn-primary {
+  .btn-primary {
     background-color: $primary-color;
     border-color: darken($primary-color, 17%);
     color: white;
     @include dynamic-color($success-color);
-}
+  }
 
-.btn-success {
+  .btn-success {
     background-color: $success-color;
     @include dynamic-color($success-color);
-}
+  }
 
-.btn-danger {
+  .btn-danger {
     background-color: $danger-color;
     @include dynamic-color($danger-color);
-}
+  }
 
-.bg-success {
+  .bg-success {
     background-color: $success-color !important;
-}
+  }
 
-.bg-danger {
+  .bg-danger {
     background-color: $danger-color !important;
-}
+  }
 
-.bg-success .dyn-dark {
+  .bg-success .dyn-dark {
     background-color: darken($success-color, 10%) !important;
-}
+  }
 
-.bg-danger .dyn-dark {
+  .bg-danger .dyn-dark {
     background-color: darken($danger-color, 10%) !important;
-}
+  }
 
-.nav-pills .nav-link.active, .nav-pills .show>.nav-link {
+  .nav-pills .nav-link.active, .nav-pills .show>.nav-link {
     background-color: $nav-tab-color;
-}
+  }
 
-.nav-pills A {
+  .nav-pills A {
     color: #424242;
-}
+  }
 
-.nav-pills I {
-   margin-right: 10px;
-}
+  .nav-pills I {
+    margin-right: 10px;
+  }
 
-@keyframes fadeInOut {
-  0%   { opacity:1; }
-  50%  { opacity:0.3; }
-  100% { opacity:1; }
-}
-@-o-keyframes fadeInOut {
-  0%   { opacity:1; }
-  50%  { opacity:0.3; }
-  100% { opacity:1; }
-}
-@-moz-keyframes fadeInOut {
-  0%   { opacity:1; }
-  50%  { opacity:0.3; }
-  100% { opacity:1; }
-}
-@-webkit-keyframes fadeInOut {
-  0%   { opacity:1; }
-  50%  { opacity:0.3; }
-  100% { opacity:1; }
-}
-.animate-fader {
-  -webkit-animation: fadeInOut 1s infinite;
-  -moz-animation: fadeInOut 1s infinite;
-  -o-animation: fadeInOut 1s infinite;
-  animation: fadeInOut 21 infinite;
-}
+  @keyframes fadeInOut {
+    0%   { opacity:1; }
+    50%  { opacity:0.3; }
+    100% { opacity:1; }
+  }
+  @-o-keyframes fadeInOut {
+    0%   { opacity:1; }
+    50%  { opacity:0.3; }
+    100% { opacity:1; }
+  }
+  @-moz-keyframes fadeInOut {
+    0%   { opacity:1; }
+    50%  { opacity:0.3; }
+    100% { opacity:1; }
+  }
+  @-webkit-keyframes fadeInOut {
+    0%   { opacity:1; }
+    50%  { opacity:0.3; }
+    100% { opacity:1; }
+  }
+  .animate-fader {
+    -webkit-animation: fadeInOut 1s infinite;
+    -moz-animation: fadeInOut 1s infinite;
+    -o-animation: fadeInOut 1s infinite;
+    animation: fadeInOut 21 infinite;
+  }
 
-.CodeMirror {
-  /* Bootstrap Settings */
-  box-sizing: border-box;
-  margin: 0;
-  font: inherit;
-  overflow: auto;
-  font-family: inherit;
-  display: block;
-  width: 100%;
-  padding: 0px;
-  font-size: 14px;
-  line-height: 1.5;
-  color: #555;
-  background-color: #fff;
-  background-image: none;
-  border: 1px solid #ccc;
-  border-radius: 4px;
-  box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-  /* Code Mirror Settings */
-  font-family: monospace;
-  position: relative;
-  overflow: hidden;
-  height:80vh;
-}
+  .CodeMirror {
+    /* Bootstrap Settings */
+    box-sizing: border-box;
+    margin: 0;
+    font: inherit;
+    overflow: auto;
+    font-family: inherit;
+    display: block;
+    width: 100%;
+    padding: 0px;
+    font-size: 14px;
+    line-height: 1.5;
+    color: #555;
+    background-color: #fff;
+    background-image: none;
+    border: 1px solid #ccc;
+    border-radius: 4px;
+    box-shadow: inset 0 1px 1px rgba(0, 0, 0, .075);
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+    /* Code Mirror Settings */
+    font-family: monospace;
+    position: relative;
+    overflow: hidden;
+    height:80vh;
+  }
 
-.CodeMirror-focused {
-  /* Bootstrap Settings */
-  border-color: #66afe9;
-  outline: 0;
-  box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
-  transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
-}
+  .CodeMirror-focused {
+    /* Bootstrap Settings */
+    border-color: #66afe9;
+    outline: 0;
+    box-shadow: inset 0 1px 1px rgba(0,0,0,.075), 0 0 8px rgba(102, 175, 233, .6);
+    transition: border-color ease-in-out .15s, box-shadow ease-in-out .15s;
+  }
 
-.switch {
-  font-size: 1rem;
-  position: relative;
-}
-.switch input {
-  position: absolute;
-  height: 1px;
-  width: 1px;
-  background: none;
-  border: 0;
-  clip: rect(0 0 0 0);
-  clip-path: inset(50%);
-  overflow: hidden;
-  padding: 0;
-}
-.switch input + label {
-  position: relative;
-  min-width: calc(calc(2.375rem * .8) * 2);
-  border-radius: calc(2.375rem * .8);
-  height: calc(2.375rem * .8);
-  line-height: calc(2.375rem * .8);
-  display: inline-block;
-  cursor: pointer;
-  outline: none;
-  user-select: none;
-  vertical-align: middle;
-  text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
-}
-.switch input + label::before,
-.switch input + label::after {
-  content: '';
-  position: absolute;
-  top: 0;
-  left: 0;
-  width: calc(calc(2.375rem * .8) * 2);
-  bottom: 0;
-  display: block;
-}
-.switch input + label::before {
-  right: 0;
-  background-color: #dee2e6;
-  border-radius: calc(2.375rem * .8);
-  transition: 0.2s all;
-}
-.switch input + label::after {
-  top: 2px;
-  left: 2px;
-  width: calc(calc(2.375rem * .8) - calc(2px * 2));
-  height: calc(calc(2.375rem * .8) - calc(2px * 2));
-  border-radius: 50%;
-  background-color: white;
-  transition: 0.2s all;
-}
-.switch input:checked + label::before {
-  background-color: #08d;
-}
-.switch input:checked + label::after {
-  margin-left: calc(2.375rem * .8);
-}
-.switch input:focus + label::before {
-  outline: none;
-  box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
-}
-.switch input:disabled + label {
-  color: #868e96;
-  cursor: not-allowed;
-}
-.switch input:disabled + label::before {
-  background-color: #e9ecef;
-}
-.switch.switch-sm {
-  font-size: 0.875rem;
-}
-.switch.switch-sm input + label {
-  min-width: calc(calc(1.9375rem * .8) * 2);
-  height: calc(1.9375rem * .8);
-  line-height: calc(1.9375rem * .8);
-  text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem);
-}
-.switch.switch-sm input + label::before {
-  width: calc(calc(1.9375rem * .8) * 2);
-}
-.switch.switch-sm input + label::after {
-  width: calc(calc(1.9375rem * .8) - calc(2px * 2));
-  height: calc(calc(1.9375rem * .8) - calc(2px * 2));
-}
-.switch.switch-sm input:checked + label::after {
-  margin-left: calc(1.9375rem * .8);
-}
-.switch.switch-lg {
-  font-size: 1.25rem;
-}
-.switch.switch-lg input + label {
-  min-width: calc(calc(3rem * .8) * 2);
-  height: calc(3rem * .8);
-  line-height: calc(3rem * .8);
-  text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem);
-}
-.switch.switch-lg input + label::before {
-  width: calc(calc(3rem * .8) * 2);
-}
-.switch.switch-lg input + label::after {
-  width: calc(calc(3rem * .8) - calc(2px * 2));
-  height: calc(calc(3rem * .8) - calc(2px * 2));
-}
-.switch.switch-lg input:checked + label::after {
-  margin-left: calc(3rem * .8);
-}
-.switch + .switch {
-  margin-left: 1rem;
-}
+  .switch {
+    font-size: 1rem;
+    position: relative;
+  }
+  .switch input {
+    position: absolute;
+    height: 1px;
+    width: 1px;
+    background: none;
+    border: 0;
+    clip: rect(0 0 0 0);
+    clip-path: inset(50%);
+    overflow: hidden;
+    padding: 0;
+  }
+  .switch input + label {
+    position: relative;
+    min-width: calc(calc(2.375rem * .8) * 2);
+    border-radius: calc(2.375rem * .8);
+    height: calc(2.375rem * .8);
+    line-height: calc(2.375rem * .8);
+    display: inline-block;
+    cursor: pointer;
+    outline: none;
+    user-select: none;
+    vertical-align: middle;
+    text-indent: calc(calc(calc(2.375rem * .8) * 2) + .5rem);
+  }
+  .switch input + label::before,
+  .switch input + label::after {
+    content: '';
+    position: absolute;
+    top: 0;
+    left: 0;
+    width: calc(calc(2.375rem * .8) * 2);
+    bottom: 0;
+    display: block;
+  }
+  .switch input + label::before {
+    right: 0;
+    background-color: #dee2e6;
+    border-radius: calc(2.375rem * .8);
+    transition: 0.2s all;
+  }
+  .switch input + label::after {
+    top: 2px;
+    left: 2px;
+    width: calc(calc(2.375rem * .8) - calc(2px * 2));
+    height: calc(calc(2.375rem * .8) - calc(2px * 2));
+    border-radius: 50%;
+    background-color: white;
+    transition: 0.2s all;
+  }
+  .switch input:checked + label::before {
+    background-color: #08d;
+  }
+  .switch input:checked + label::after {
+    margin-left: calc(2.375rem * .8);
+  }
+  .switch input:focus + label::before {
+    outline: none;
+    box-shadow: 0 0 0 0.2rem rgba(0, 136, 221, 0.25);
+  }
+  .switch input:disabled + label {
+    color: #868e96;
+    cursor: not-allowed;
+  }
+  .switch input:disabled + label::before {
+    background-color: #e9ecef;
+  }
+  .switch.switch-sm {
+    font-size: 0.875rem;
+  }
+  .switch.switch-sm input + label {
+    min-width: calc(calc(1.9375rem * .8) * 2);
+    height: calc(1.9375rem * .8);
+    line-height: calc(1.9375rem * .8);
+    text-indent: calc(calc(calc(1.9375rem * .8) * 2) + .5rem);
+  }
+  .switch.switch-sm input + label::before {
+    width: calc(calc(1.9375rem * .8) * 2);
+  }
+  .switch.switch-sm input + label::after {
+    width: calc(calc(1.9375rem * .8) - calc(2px * 2));
+    height: calc(calc(1.9375rem * .8) - calc(2px * 2));
+  }
+  .switch.switch-sm input:checked + label::after {
+    margin-left: calc(1.9375rem * .8);
+  }
+  .switch.switch-lg {
+    font-size: 1.25rem;
+  }
+  .switch.switch-lg input + label {
+    min-width: calc(calc(3rem * .8) * 2);
+    height: calc(3rem * .8);
+    line-height: calc(3rem * .8);
+    text-indent: calc(calc(calc(3rem * .8) * 2) + .5rem);
+  }
+  .switch.switch-lg input + label::before {
+    width: calc(calc(3rem * .8) * 2);
+  }
+  .switch.switch-lg input + label::after {
+    width: calc(calc(3rem * .8) - calc(2px * 2));
+    height: calc(calc(3rem * .8) - calc(2px * 2));
+  }
+  .switch.switch-lg input:checked + label::after {
+    margin-left: calc(3rem * .8);
+  }
+  .switch + .switch {
+    margin-left: 1rem;
+  }
 
-.sortable_drag {
-  background-color: #0000000f;
-}
+  .sortable_drag {
+    background-color: #0000000f;
+  }
 
-.drag_icon {
-  cursor: move; /* fallback if grab cursor is unsupported */
-  cursor: grab;
-  cursor: -moz-grab;
-  cursor: -webkit-grab;
-  width: 25px;
-  height: 25px;
-  display: inline-block;
-  margin-right: 5px;
-  margin-left: -10px;
-  text-align: center;
-  color: #b1b1b1;
-}
+  .drag_icon {
+    cursor: move; /* fallback if grab cursor is unsupported */
+    cursor: grab;
+    cursor: -moz-grab;
+    cursor: -webkit-grab;
+    width: 25px;
+    height: 25px;
+    display: inline-block;
+    margin-right: 5px;
+    margin-left: -10px;
+    text-align: center;
+    color: #b1b1b1;
+  }
 
-/* (Optional) Apply a "closed-hand" cursor during drag operation. */
-.drag_icon:active {
-  cursor: grabbing;
-  cursor: -moz-grabbing;
-  cursor: -webkit-grabbing;
-}
+  /* (Optional) Apply a "closed-hand" cursor during drag operation. */
+  .drag_icon:active {
+    cursor: grabbing;
+    cursor: -moz-grabbing;
+    cursor: -webkit-grabbing;
+  }
 
-.switch_btn {
-  float: right;
-  margin: -1px 0px 0px 0px;
-  display: block;
-}
+  .switch_btn {
+    float: right;
+    margin: -1px 0px 0px 0px;
+    display: block;
+  }
 
-#start_container {
-  position: absolute;
-  z-index: 99999;
-  margin-top: 20px;
-}
+  #start_container {
+    position: absolute;
+    z-index: 99999;
+    margin-top: 20px;
+  }
 
-#end_container {
-  position: absolute;
-  z-index: 99999;
-  margin-top: 20px;
-  right: 0;
-}
+  #end_container {
+    position: absolute;
+    z-index: 99999;
+    margin-top: 20px;
+    right: 0;
+  }
 
-.pointer {
-  cursor: pointer;
-}
+  .pointer {
+    cursor: pointer;
+  }
 
-.jumbotron {
-  background-color: white;
-}
+  .jumbotron {
+    background-color: white;
+  }
 
-.toggle-service {
-  font-size: 18pt;
-  float: left;
-  margin: 2px 3px 0 0;
-  cursor: pointer;
-}
+  .toggle-service {
+    font-size: 18pt;
+    float: left;
+    margin: 2px 3px 0 0;
+    cursor: pointer;
+  }
 
-.list-group-item {
+  .list-group-item {
     min-height: 85pt;
-}
+  }
 
-.list-group-item:HOVER {
-  background-color: #fff;
-}
+  .list-group-item:HOVER {
+    background-color: #fff;
+  }
 
-.index_container {
+  .index_container {
     min-height: 980pt;
-}
+  }
 
-/* Enter and leave animations can use different */
-/* durations and timing functions.              */
-.slide-fade-enter-active {
-  transition: all .3s ease;
-}
-.slide-fade-leave-active {
-  transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
-}
-.slide-fade-enter, .slide-fade-leave-to
-/* .slide-fade-leave-active below version 2.1.8 */ {
-  transform: translateX(10px);
-  opacity: 0;
-}
+  /* Enter and leave animations can use different */
+  /* durations and timing functions.              */
+  .slide-fade-enter-active {
+    transition: all .3s ease;
+  }
+  .slide-fade-leave-active {
+    transition: all .8s cubic-bezier(1.0, 0.5, 0.8, 1.0);
+  }
+  .slide-fade-enter, .slide-fade-leave-to
+    /* .slide-fade-leave-active below version 2.1.8 */ {
+    transform: translateX(10px);
+    opacity: 0;
+  }
 
-@import 'mobile';
+  @import 'mobile';
diff --git a/frontend/src/assets/scss/mobile.scss b/frontend/src/assets/scss/mobile.scss
index c026b51b..a7e33821 100644
--- a/frontend/src/assets/scss/mobile.scss
+++ b/frontend/src/assets/scss/mobile.scss
@@ -6,6 +6,10 @@
         background-color: $sm-background-color;
     }
 
+  .index_container {
+    padding-top: 4.5vh !important;
+  }
+
     .sm-container {
         margin-top: 0px !important;
         padding: 0 !important;
@@ -20,9 +24,13 @@
         font-size: 0.9rem;
     }
 
+  .service_li {
+    border: 1px solid #f3f3f3 !important;
+  }
+
     .container {
         padding: 0px !important;
-        padding-top: 4vh !important;
+        padding-top: 0vh !important;
         min-height: 960pt;
     }
 
@@ -34,12 +42,22 @@
         margin-left: 0px;
         margin-top: 0px;
         width: 100%;
-        margin-bottom: 0;
         box-shadow: 1px 10px 20px 0px;
         height: 55pt;
         color: rgba(0, 0, 0, 0.20);
+      margin-bottom: 20pt;
     }
 
+  .navbar-collapse {
+    z-index: 999999;
+    background-color: #f9f9f9;
+    width: 100%;
+    padding: 10pt 15pt;
+    left: 0px;
+    top: 75px;
+    position: absolute;
+  }
+
     .btn-sm {
         line-height: 1.4rem;
         font-size: 1rem;
diff --git a/frontend/src/components/Dashboard/DashboardMessages.vue b/frontend/src/components/Dashboard/DashboardMessages.vue
index b72dc84e..7aa1b8a5 100644
--- a/frontend/src/components/Dashboard/DashboardMessages.vue
+++ b/frontend/src/components/Dashboard/DashboardMessages.vue
@@ -1,7 +1,8 @@
 <template>
-    <div>
     <div class="col-12">
-        <h3 class="text-black-50">Messages</h3>
+        <div class="card contain-card text-black-50 bg-white mb-4">
+            <div class="card-header">Messages</div>
+            <div class="card-body">
         <table class="table table-striped">
             <thead>
             <tr>
@@ -30,9 +31,9 @@
             </tbody>
         </table>
     </div>
+        </div>
 
-        <FormMessage :edit="editChange" :in_message="message"/>
-
+            <FormMessage :edit="editChange" :in_message="message"/>
     </div>
 </template>
 
diff --git a/frontend/src/components/Dashboard/DashboardServices.vue b/frontend/src/components/Dashboard/DashboardServices.vue
index 90c965f1..0fdf460c 100644
--- a/frontend/src/components/Dashboard/DashboardServices.vue
+++ b/frontend/src/components/Dashboard/DashboardServices.vue
@@ -1,19 +1,19 @@
 <template>
-    <div>
     <div class="col-12">
-        <h3 class="text-black-50">Services
-            <router-link to="/dashboard/create_service" class="btn btn-outline-success mt-1 float-right">
+        <div class="card contain-card text-black-50 bg-white mb-4">
+            <div class="card-header">Services
+                <router-link to="/dashboard/create_service" class="btn btn-sm btn-outline-success float-right">
                 <font-awesome-icon icon="plus"/>  Create
-            </router-link>
-        </h3>
+            </router-link></div>
+            <div class="card-body">
+                <ServicesList/>
+            </div>
+        </div>
 
-        <ServicesList/>
 
-    </div>
-
-    <div class="col-12 mt-5">
-
-        <h1 class="text-muted">Groups</h1>
+        <div class="card contain-card text-black-50 bg-white mb-4">
+            <div class="card-header">Groups</div>
+            <div class="card-body">
         <table class="table">
             <thead>
             <tr>
@@ -27,7 +27,7 @@
             <draggable tag="tbody" v-model="groupsList" class="sortable_groups" handle=".drag_icon">
             <tr v-for="(group, index) in $store.getters.groupsCleanInOrder" v-bind:key="group.id">
                 <td><span class="drag_icon d-none d-md-inline">
-                    <font-awesome-icon icon="bars" /></span> {{group.name}}
+                    <font-awesome-icon icon="bars" class="mr-3" /></span> {{group.name}}
                 </td>
                 <td>{{$store.getters.servicesInGroup(group.id).length}}</td>
                 <td>
@@ -47,10 +47,14 @@
                 </draggable>
         </table>
 
+            </div>
+        </div>
+
+
         <FormGroup :edit="editChange" :in_group="group"/>
 
     </div>
-    </div>
+
 </template>
 
 <script>
diff --git a/frontend/src/components/Dashboard/DashboardUsers.vue b/frontend/src/components/Dashboard/DashboardUsers.vue
index b76799e4..7f2f1374 100644
--- a/frontend/src/components/Dashboard/DashboardUsers.vue
+++ b/frontend/src/components/Dashboard/DashboardUsers.vue
@@ -1,6 +1,8 @@
 <template>
     <div class="col-12">
-        <h3 class="text-black-50">Users</h3>
+        <div class="card contain-card text-black-50 bg-white mb-5">
+            <div class="card-header">Users</div>
+            <div class="card-body">
         <table class="table table-striped">
             <thead>
                 <tr>
@@ -26,8 +28,11 @@
             </tr>
             </tbody>
         </table>
+            </div>
+        </div>
+
+                <FormUser :edit="editChange" :in_user="user"/>
 
-        <FormUser :edit="editChange" :in_user="user"/>
     </div>
 </template>
 
diff --git a/frontend/src/components/Dashboard/ServicesList.vue b/frontend/src/components/Dashboard/ServicesList.vue
index 20ee1cee..a8a1fb0d 100644
--- a/frontend/src/components/Dashboard/ServicesList.vue
+++ b/frontend/src/components/Dashboard/ServicesList.vue
@@ -3,7 +3,7 @@
         <thead>
         <tr>
             <th scope="col">Name</th>
-            <th scope="col" class="d-none d-md-table-cell">Status</th>
+            <th scope="col" class="d-none d-md-table-cell"></th>
             <th scope="col" class="d-none d-md-table-cell">Visibility</th>
             <th scope="col" class="d-none d-md-table-cell">Group</th>
             <th scope="col"></th>
@@ -13,13 +13,10 @@
             <tr v-for="(service, index) in $store.getters.servicesInOrder" :key="service.id">
                 <td>
                     <span class="drag_icon d-none d-md-inline">
-                        <font-awesome-icon icon="bars" />
+                        <font-awesome-icon icon="bars" class="mr-3"/>
                     </span> {{service.name}}
                 </td>
                 <td class="d-none d-md-table-cell">
-                    <span class="badge" :class="{'animate-fader': !service.online, 'badge-success': service.online, 'badge-danger': !service.online}">
-                        {{service.online ? "ONLINE" : "OFFLINE"}}
-                    </span>
                     <ToggleSwitch v-if="service.online" :service="service"/>
                 </td>
                 <td class="d-none d-md-table-cell">
diff --git a/frontend/src/components/Service/ServiceBlock.vue b/frontend/src/components/Service/ServiceBlock.vue
index faf1d278..941eb0cd 100644
--- a/frontend/src/components/Service/ServiceBlock.vue
+++ b/frontend/src/components/Service/ServiceBlock.vue
@@ -18,12 +18,22 @@
             </div>
 
             <div class="row lower_canvas full-col-12 text-white" :class="{'bg-success': service.online, 'bg-danger': !service.online}">
-                <div class="col-10 text-truncate">
-                    <span class="d-none d-md-inline">
-                        {{smallText(service)}}
-                    </span>
+                <div class="col-md-8 col-6">
+                        <div class="dropup" :class="{show: dropDownMenu}">
+                              <button style="font-size: 10pt;" @focusout="dropDownMenu = false"  @click="dropDownMenu = !dropDownMenu" type="button" class="col-4 float-left btn btn-sm float-right btn-block text-white dropdown-toggle service_scale" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
+                                  24 Hours
+                              </button>
+                              <div class="dropdown-menu" :class="{show: dropDownMenu}">
+                                <a v-for="(timeframe, i) in timeframes" @click="timeframe.picked = true" class="dropdown-item" href="#">{{timeframe.text}}</a>
+                              </div>
+
+                            <span class="d-none float-right d-md-inline">
+                                {{smallText(service)}}
+                            </span>
+                        </div>
                 </div>
-                <div class="col-sm-12 col-md-2">
+
+                <div class="col-md-4 col-6 float-right">
                     <router-link :to="serviceLink(service)" class="btn btn-sm float-right dyn-dark btn-block text-white" :class="{'bg-success': service.online, 'bg-danger': !service.online}">
                         View Service</router-link>
                 </div>
@@ -49,6 +59,14 @@ export default {
     data() {
         return {
             visible: false,
+            dropDownMenu: false,
+            timeframes: [
+                {value: "72h", text: "3 Days", picked: true },
+                {value: "24h", text: "Since Yesterday" },
+                {value: "3", text: "3 Hours" },
+                {value: "1m", text: "1 Month" },
+                {value: "3", text: "Last 3 Months" },
+            ]
         }
     },
     methods: {
diff --git a/frontend/src/components/Service/ServiceHeatmap.vue b/frontend/src/components/Service/ServiceHeatmap.vue
index 044fab3a..997b7848 100644
--- a/frontend/src/components/Service/ServiceHeatmap.vue
+++ b/frontend/src/components/Service/ServiceHeatmap.vue
@@ -21,6 +21,29 @@
               ready: false,
               data: [],
               chartOptions: {
+                  heatmap: {
+                      colorScale: {
+                          ranges: [{
+                              from: 0,
+                              to: 1,
+                              color: 'rgba(235,63,48,0.69)',
+                              name: 'low',
+                          },
+                              {
+                                  from: 2,
+                                  to: 10,
+                                  color: 'rgba(245,43,43,0.58)',
+                                  name: 'medium',
+                              },
+                              {
+                                  from: 11,
+                                  to: 999,
+                                  color: '#cb221c',
+                                  name: 'high',
+                              }
+                          ]
+                      }
+                  },
                   chart: {
                       height: "100%",
                       width: "100%",
@@ -64,15 +87,21 @@
       methods: {
           async chartHeatmap() {
               const start = this.nowSubtract((3600 * 24) * 7)
-              const data = await Api.service_heatmap(this.service.id, this.toUnix(start), this.toUnix(new Date()), "1h")
+              const data = await Api.service_failures_data(this.service.id, this.toUnix(start), this.toUnix(new Date()), "24h", true)
+
+              window.console.log(data)
 
               let dataArr = []
               data.forEach(function(d) {
-                  let date = new Date(d.date);
-                  dataArr.push({name: date.toLocaleString('en-us', { month: 'long' }), data: d.data});
+                  dataArr.push({x: d.timeframe, y: 5+d.amount});
               });
 
-              this.series = dataArr
+              let date = new Date(dataArr[0].x);
+              const output = [{name: date.toLocaleString('en-us', { month: 'long'}), data: dataArr}]
+
+              window.console.log(output)
+
+              this.series = output
               this.ready = true
           }
       }
diff --git a/frontend/src/forms/Group.vue b/frontend/src/forms/Group.vue
index 641297b5..f6346991 100644
--- a/frontend/src/forms/Group.vue
+++ b/frontend/src/forms/Group.vue
@@ -1,12 +1,11 @@
 <template>
-    <div>
-        <h1 class="text-muted mt-5">
-            {{group.id ? `Update ${group.name}` : "Create Group"}}
-            <button @click="removeEdit" v-if="group.id" class="mt-3 btn float-right btn-danger btn-sm">Close</button>
-        </h1>
+    <div class="card contain-card text-black-50 bg-white mb-3">
+        <div class="card-header">{{group.id ? `Update ${group.name}` : "Create Group"}}
+            <transition name="slide-fade">
+                <button @click="removeEdit" v-if="group.id" class="btn float-right btn-danger btn-sm">Close</button>
+            </transition></div>
+        <div class="card-body">
 
-        <div class="card">
-            <div class="card-body">
     <form @submit="saveGroup">
         <div class="form-group row">
             <label for="title" class="col-sm-4 col-form-label">Group Name</label>
@@ -16,7 +15,7 @@
         </div>
         <div class="form-group row">
             <label for="switch-group-public" class="col-sm-4 col-form-label">Public Group</label>
-            <div class="col-8 mt-1">
+            <div class="col-md-8 col-xs-12 mt-1">
             <span @click="group.public = !!group.public" class="switch float-left">
                 <input v-model="group.public" type="checkbox" class="switch" id="switch-group-public" :checked="group.public">
                 <label for="switch-group-public">Show group services to the public</label>
@@ -33,7 +32,6 @@
         <div class="alert alert-danger d-none" id="alerter" role="alert"></div>
     </form>
             </div>
-        </div>
     </div>
 </template>
 
diff --git a/frontend/src/forms/Message.vue b/frontend/src/forms/Message.vue
index ec94320b..c6e71559 100644
--- a/frontend/src/forms/Message.vue
+++ b/frontend/src/forms/Message.vue
@@ -1,11 +1,13 @@
 <template>
-    <div class="col-12">
-        <h3 class="text-black-50 mt-5">
-            {{message.id ? `Update ${message.title}` : "Create Message"}}
-            <button @click="removeEdit" v-if="message.id" class="mt-3 btn float-right btn-danger btn-sm">Close</button>
-        </h3>
-        <div class="card">
-            <div class="card-body">
+<div>
+    <div class="card contain-card text-black-50 bg-white mb-5">
+        <div class="card-header">{{message.id ? `Update ${message.title}` : "Create Message"}}
+
+            <transition name="slide-fade">
+                <button @click="removeEdit" v-if="message.id" class="btn btn-sm float-right btn-danger btn-sm">Close</button>
+            </transition>
+        </div>
+        <div class="card-body">
     <form @submit="saveMessage">
         <div class="form-group row">
             <label class="col-sm-4 col-form-label">Title</label>
@@ -84,9 +86,8 @@
         <div class="alert alert-danger d-none" id="alerter" role="alert"></div>
     </form>
             </div>
-        </div>
-
     </div>
+</div>
 </template>
 
 <script>
diff --git a/frontend/src/forms/User.vue b/frontend/src/forms/User.vue
index 17d46f8c..bafecc94 100644
--- a/frontend/src/forms/User.vue
+++ b/frontend/src/forms/User.vue
@@ -1,12 +1,11 @@
 <template>
-    <div>
-        <h3 class="text-black-50 mt-5">
-            {{user.id ? `Update ${user.username}` : "Create User"}}
-
-        <button @click.prevent="removeEdit" v-if="user.id" class="mt-3 btn float-right btn-danger btn-sm">Close</button></h3>
-
-        <div class="card">
-            <div class="card-body">
+    <div class="card contain-card text-black-50 bg-white mb-3">
+        <div class="card-header"> {{user.id ? `Update ${user.username}` : "Create User"}}
+            <transition name="slide-fade">
+                <button @click.prevent="removeEdit" v-if="user.id" class="btn btn-sm float-right btn-danger btn-sm">Close</button>
+            </transition>
+        </div>
+        <div class="card-body">
     <form @submit="saveUser">
         <div class="form-group row">
             <label class="col-sm-4 col-form-label">Username</label>
@@ -49,8 +48,7 @@
         </div>
         <div class="alert alert-danger d-none" id="alerter" role="alert"></div>
     </form>
-            </div>
-        </div>
+    </div>
     </div>
 </template>
 
diff --git a/frontend/src/mixin.js b/frontend/src/mixin.js
index 3f2d75aa..00d0ede0 100644
--- a/frontend/src/mixin.js
+++ b/frontend/src/mixin.js
@@ -1,5 +1,5 @@
 import Vue from "vue";
-const { zonedTimeToUtc, utcToZonedTime, subSeconds, parse, parseISO, getUnixTime, fromUnixTime, format, differenceInSeconds, formatDistanceToNow, formatDistance } = require('date-fns')
+const { zonedTimeToUtc, utcToZonedTime, lastDayOfMonth, subSeconds, parse, parseISO, getUnixTime, fromUnixTime, format, differenceInSeconds, formatDistanceToNow, formatDistance } = require('date-fns')
 
 export default Vue.mixin({
   methods: {
@@ -15,10 +15,13 @@ export default Vue.mixin({
     ago(t1) {
       return formatDistanceToNow(t1)
     },
+      daysInMonth(t1) {
+          return lastDayOfMonth(t1)
+      },
     nowSubtract(seconds) {
       return subSeconds(new Date(), seconds)
     },
-    duration(t1, t2) {
+    dur(t1, t2) {
       return formatDistance(t1, t2)
     },
     niceDate(val) {
diff --git a/frontend/src/pages/Service.vue b/frontend/src/pages/Service.vue
index 63855cab..fd294da7 100644
--- a/frontend/src/pages/Service.vue
+++ b/frontend/src/pages/Service.vue
@@ -250,7 +250,7 @@ export default {
             const start = this.nowSubtract((3600 * 24) * 3)
             this.start_time = start
             this.end_time = new Date()
-            this.data = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(new Date()), "15m", false)
+            this.data = await Api.service_hits(this.service.id, this.toUnix(start), this.toUnix(new Date()), "30m", false)
             this.series = [{
                 name: this.service.name,
                 ...this.data
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index d2d710aa..58d7251b 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -35,7 +35,19 @@
                 <div class="tab-content" id="v-pills-tabContent">
                     <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-home-tab'), show: liClass('v-pills-home-tab')}" id="v-pills-home" role="tabpanel" aria-labelledby="v-pills-home-tab">
 
-                        <CoreSettings/>
+                        <div class="card text-black-50 bg-white mb-5">
+                            <div class="card-header">Statping Settings</div>
+                            <div class="card-body">
+
+                                <CoreSettings/>
+
+                            </div>
+                        </div>
+
+
+                        <div class="card text-black-50 bg-white mb-3">
+                            <div class="card-header">Statping Settings</div>
+                            <div class="card-body">
 
                         <h2 class="mt-5">Additional Settings</h2>
                         <div v-if="core.domain !== ''" class="row">
@@ -51,14 +63,27 @@
                             Insert a domain to view QR code for the mobile app.
                         </div>
 
+                            </div>
+                        </div>
+
                     </div>
 
                     <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-style-tab'), show: liClass('v-pills-style-tab')}" id="v-pills-style" role="tabpanel" aria-labelledby="v-pills-style-tab">
-                        <ThemeEditor :core="core"/>
+                        <div class="card text-black-50 bg-white mb-5">
+                            <div class="card-header">Theme Editor</div>
+                            <div class="card-body">
+                                <ThemeEditor :core="core"/>
+                            </div>
+                        </div>
                     </div>
 
                     <div class="tab-pane fade" v-bind:class="{active: liClass('v-pills-cache-tab'), show: liClass('v-pills-cache-tab')}" id="v-pills-cache" role="tabpanel" aria-labelledby="v-pills-cache-tab">
-                        <Cache/>
+                        <div class="card text-black-50 bg-white mb-5">
+                            <div class="card-header">Cache</div>
+                            <div class="card-body">
+                                <Cache/>
+                            </div>
+                        </div>
                     </div>
 
                     <div v-for="(notifier, index) in $store.getters.notifiers" v-bind:key="`${notifier.title}_${index}`" class="tab-pane fade" v-bind:class="{active: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`), show: liClass(`v-pills-${notifier.method.toLowerCase()}-tab`)}" v-bind:id="`v-pills-${notifier.method.toLowerCase()}-tab`" role="tabpanel" v-bind:aria-labelledby="`v-pills-${notifier.method.toLowerCase()}-tab`">
diff --git a/frontend/yarn.lock b/frontend/yarn.lock
index efc32f35..af086de0 100644
--- a/frontend/yarn.lock
+++ b/frontend/yarn.lock
@@ -19,17 +19,17 @@
     semver "^5.5.0"
 
 "@babel/core@^7.1.0", "@babel/core@^7.7.5", "@babel/core@^7.8.4":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.6.tgz#27d7df9258a45c2e686b6f18b6c659e563aa4636"
-  integrity sha512-Sheg7yEJD51YHAvLEV/7Uvw95AeWqYPL3Vk3zGujJKIhJ+8oLw2ALaf3hbucILhKsgSoADOvtKRJuNVdcJkOrg==
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.8.7.tgz#b69017d221ccdeb203145ae9da269d72cf102f3b"
+  integrity sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==
   dependencies:
     "@babel/code-frame" "^7.8.3"
-    "@babel/generator" "^7.8.6"
+    "@babel/generator" "^7.8.7"
     "@babel/helpers" "^7.8.4"
-    "@babel/parser" "^7.8.6"
+    "@babel/parser" "^7.8.7"
     "@babel/template" "^7.8.6"
     "@babel/traverse" "^7.8.6"
-    "@babel/types" "^7.8.6"
+    "@babel/types" "^7.8.7"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.1"
@@ -59,12 +59,12 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.2.2", "@babel/generator@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.6.tgz#57adf96d370c9a63c241cd719f9111468578537a"
-  integrity sha512-4bpOR5ZBz+wWcMeVtcf7FbjcFzCp+817z2/gHNncIRcM9MmKzUhtWCYAq27RAfUrAFwb+OCG1s9WEaVxfi6cjg==
+"@babel/generator@^7.2.2", "@babel/generator@^7.8.6", "@babel/generator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.8.7.tgz#870b3cf7984f5297998152af625c4f3e341400f7"
+  integrity sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==
   dependencies:
-    "@babel/types" "^7.8.6"
+    "@babel/types" "^7.8.7"
     jsesc "^2.5.1"
     lodash "^4.17.13"
     source-map "^0.5.0"
@@ -84,22 +84,22 @@
     "@babel/helper-explode-assignable-expression" "^7.8.3"
     "@babel/types" "^7.8.3"
 
-"@babel/helper-call-delegate@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.3.tgz#de82619898aa605d409c42be6ffb8d7204579692"
-  integrity sha512-6Q05px0Eb+N4/GTyKPPvnkig7Lylw+QzihMpws9iiZQv7ZImf84ZsZpQH7QoWN4n4tm81SnSzPgHw2qtO0Zf3A==
+"@babel/helper-call-delegate@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz#28a279c2e6c622a6233da548127f980751324cab"
+  integrity sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==
   dependencies:
     "@babel/helper-hoist-variables" "^7.8.3"
     "@babel/traverse" "^7.8.3"
-    "@babel/types" "^7.8.3"
+    "@babel/types" "^7.8.7"
 
-"@babel/helper-compilation-targets@^7.8.4", "@babel/helper-compilation-targets@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.6.tgz#015b85db69e3a34240d5c2b761fc53eb9695f09c"
-  integrity sha512-UrJdk27hKVJSnibFcUWYLkCL0ZywTUoot8yii1lsHJcvwrypagmYKjHLMWivQPm4s6GdyygCL8fiH5EYLxhQwQ==
+"@babel/helper-compilation-targets@^7.8.4", "@babel/helper-compilation-targets@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz#dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"
+  integrity sha512-4mWm8DCK2LugIS+p1yArqvG1Pf162upsIsjE7cNBjez+NjliQpVhj20obE520nao0o14DaTnFJv+Fw5a0JpoUw==
   dependencies:
     "@babel/compat-data" "^7.8.6"
-    browserslist "^4.8.5"
+    browserslist "^4.9.1"
     invariant "^2.2.4"
     levenary "^1.1.1"
     semver "^5.5.0"
@@ -275,10 +275,10 @@
     esutils "^2.0.2"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.6.tgz#ba5c9910cddb77685a008e3c587af8d27b67962c"
-  integrity sha512-trGNYSfwq5s0SgM1BMEB8hX3NDmO7EP2wsDGDexiaKMB92BaRpS+qZfpkMqUBhcsOTBwNy9B/jieo4ad/t/z2g==
+"@babel/parser@^7.0.0", "@babel/parser@^7.2.2", "@babel/parser@^7.7.5", "@babel/parser@^7.8.6", "@babel/parser@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.8.7.tgz#7b8facf95d25fef9534aad51c4ffecde1a61e26a"
+  integrity sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==
 
 "@babel/plugin-proposal-async-generator-functions@^7.8.3":
   version "7.8.3"
@@ -641,12 +641,12 @@
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/helper-replace-supers" "^7.8.3"
 
-"@babel/plugin-transform-parameters@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.4.tgz#1d5155de0b65db0ccf9971165745d3bb990d77d3"
-  integrity sha512-IsS3oTxeTsZlE5KqzTbcC2sV0P9pXdec53SU+Yxv7o/6dvGM5AkTotQKhoSffhNgZ/dftsSiOoxy7evCYJXzVA==
+"@babel/plugin-transform-parameters@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz#66fa2f1de4129b4e0447509223ac71bda4955395"
+  integrity sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==
   dependencies:
-    "@babel/helper-call-delegate" "^7.8.3"
+    "@babel/helper-call-delegate" "^7.8.7"
     "@babel/helper-get-function-arity" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
 
@@ -657,12 +657,12 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.3"
 
-"@babel/plugin-transform-regenerator@^7.8.3":
-  version "7.8.3"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.3.tgz#b31031e8059c07495bf23614c97f3d9698bc6ec8"
-  integrity sha512-qt/kcur/FxrQrzFR432FGZznkVAjiyFtCOANjkAKwCbt465L6ZCiUQh2oMYGU3Wo8LRFJxNDFwWn106S5wVUNA==
+"@babel/plugin-transform-regenerator@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz#5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"
+  integrity sha512-TIg+gAl4Z0a3WmD3mbYSk+J9ZUH6n/Yc57rtKRnlA/7rcCvpekHXe0CMZHP1gYp7/KLe9GHTuIba0vXmls6drA==
   dependencies:
-    regenerator-transform "^0.14.0"
+    regenerator-transform "^0.14.2"
 
 "@babel/plugin-transform-reserved-words@^7.8.3":
   version "7.8.3"
@@ -735,12 +735,12 @@
     regenerator-runtime "^0.12.0"
 
 "@babel/preset-env@^7.8.4", "@babel/preset-env@~7.8.3":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.6.tgz#2a0773b08589ecba4995fc71b1965e4f531af40b"
-  integrity sha512-M5u8llV9DIVXBFB/ArIpqJuvXpO+ymxcJ6e8ZAmzeK3sQeBNOD1y+rHvHCGG4TlEmsNpIrdecsHGHT8ZCoOSJg==
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.8.7.tgz#1fc7d89c7f75d2d70c2b6768de6c2e049b3cb9db"
+  integrity sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==
   dependencies:
     "@babel/compat-data" "^7.8.6"
-    "@babel/helper-compilation-targets" "^7.8.6"
+    "@babel/helper-compilation-targets" "^7.8.7"
     "@babel/helper-module-imports" "^7.8.3"
     "@babel/helper-plugin-utils" "^7.8.3"
     "@babel/plugin-proposal-async-generator-functions" "^7.8.3"
@@ -780,9 +780,9 @@
     "@babel/plugin-transform-named-capturing-groups-regex" "^7.8.3"
     "@babel/plugin-transform-new-target" "^7.8.3"
     "@babel/plugin-transform-object-super" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.8.4"
+    "@babel/plugin-transform-parameters" "^7.8.7"
     "@babel/plugin-transform-property-literals" "^7.8.3"
-    "@babel/plugin-transform-regenerator" "^7.8.3"
+    "@babel/plugin-transform-regenerator" "^7.8.7"
     "@babel/plugin-transform-reserved-words" "^7.8.3"
     "@babel/plugin-transform-shorthand-properties" "^7.8.3"
     "@babel/plugin-transform-spread" "^7.8.3"
@@ -790,7 +790,7 @@
     "@babel/plugin-transform-template-literals" "^7.8.3"
     "@babel/plugin-transform-typeof-symbol" "^7.8.4"
     "@babel/plugin-transform-unicode-regex" "^7.8.3"
-    "@babel/types" "^7.8.6"
+    "@babel/types" "^7.8.7"
     browserslist "^4.8.5"
     core-js-compat "^3.6.2"
     invariant "^2.2.2"
@@ -798,11 +798,11 @@
     semver "^5.5.0"
 
 "@babel/runtime@^7.8.4":
-  version "7.8.4"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.4.tgz#d79f5a2040f7caa24d53e563aad49cbc05581308"
-  integrity sha512-neAp3zt80trRVBI1x0azq6c57aNBqYZH8KhMm3TaB7wEI5Q4A2SHfBHE8w9gOhI/lrqxtEbXZgQIrHP+wvSGwQ==
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.7.tgz#8fefce9802db54881ba59f90bb28719b4996324d"
+  integrity sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==
   dependencies:
-    regenerator-runtime "^0.13.2"
+    regenerator-runtime "^0.13.4"
 
 "@babel/template@^7.2.2", "@babel/template@^7.7.4", "@babel/template@^7.8.3", "@babel/template@^7.8.6":
   version "7.8.6"
@@ -828,10 +828,10 @@
     globals "^11.1.0"
     lodash "^4.17.13"
 
-"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
-  version "7.8.6"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.6.tgz#629ecc33c2557fcde7126e58053127afdb3e6d01"
-  integrity sha512-wqz7pgWMIrht3gquyEFPVXeXCti72Rm8ep9b5tQKz9Yg9LzJA3HxosF1SB3Kc81KD1A3XBkkVYtJvCKS2Z/QrA==
+"@babel/types@^7.0.0", "@babel/types@^7.2.2", "@babel/types@^7.8.3", "@babel/types@^7.8.6", "@babel/types@^7.8.7":
+  version "7.8.7"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.8.7.tgz#1fc9729e1acbb2337d5b6977a63979b4819f5d1d"
+  integrity sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==
   dependencies:
     esutils "^2.0.2"
     lodash "^4.17.13"
@@ -1099,9 +1099,9 @@
   integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
 
 "@types/node@*":
-  version "13.7.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.7.7.tgz#1628e6461ba8cc9b53196dfeaeec7b07fa6eea99"
-  integrity sha512-Uo4chgKbnPNlxQwoFmYIwctkQVkMMmsAoGGU4JKwLuvBefF0pCq4FybNSnfkfRCpC7ZW7kttcC/TrRtAJsvGtg==
+  version "13.9.0"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-13.9.0.tgz#5b6ee7a77faacddd7de719017d0bc12f52f81589"
+  integrity sha512-0ARSQootUG1RljH2HncpsY2TJBfGQIKOOi7kxzUY6z54ePu/ZD+wJA8zI2Q6v8rol2qpG/rvqsReco8zNMPvhQ==
 
 "@types/normalize-package-data@^2.4.0":
   version "2.4.0"
@@ -1745,16 +1745,16 @@ anymatch@^3.0.3, anymatch@~3.1.1:
     picomatch "^2.0.4"
 
 apexcharts@^3.15.0:
-  version "3.16.0"
-  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.16.0.tgz#7fec05f85773c2b89a7b757cfe551a9c055807ed"
-  integrity sha512-tD7d/VJ9G2giVIOTowi89RKu4Ptp/jJdvrmkBJiaaOROCT3Wa4qyJ6QKp4dgUmpN5z0xMFxtDPaikItW2BEucw==
+  version "3.16.1"
+  resolved "https://registry.yarnpkg.com/apexcharts/-/apexcharts-3.16.1.tgz#96e6a478e71d2903562087ce2ecf2e88d4cd9a06"
+  integrity sha512-3MpUk6+clv9tGtb3OQBPRjyLc6g6nHvO2Gk1v8gBhD3tY3MiFi/RP4ItaHyW4SaqBtyK8oHugsgGlanZDTviVQ==
   dependencies:
     svg.draggable.js "^2.2.2"
     svg.easing.js "^2.0.0"
     svg.filter.js "^2.0.2"
     svg.pathmorphing.js "^0.1.3"
     svg.resize.js "^1.4.3"
-    svg.select.js "^2.1.2"
+    svg.select.js "^3.0.1"
 
 aproba@^1.0.3, aproba@^1.1.1:
   version "1.2.0"
@@ -2140,10 +2140,10 @@ brorand@^1.0.1:
   resolved "https://registry.yarnpkg.com/brorand/-/brorand-1.1.0.tgz#12c25efe40a45e3c323eb8675a0a0ce57b22371f"
   integrity sha1-EsJe/kCkXjwyPrhnWgoM5XsiNx8=
 
-browser-process-hrtime@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-0.1.3.tgz#616f00faef1df7ec1b5bf9cfe2bdc3170f26c7b4"
-  integrity sha512-bRFnI4NnjO6cnyLmOV/7PVoDEMJChlcfN0z4s1YMBY989/SvlfMI1lgCnkFUs53e9gQF+w7qu7XdllSTiSl8Aw==
+browser-process-hrtime@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
+  integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
 browser-stdout@1.3.1:
   version "1.3.1"
@@ -2209,7 +2209,7 @@ browserify-zlib@^0.2.0:
   dependencies:
     pako "~1.0.5"
 
-browserslist@^4.0.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.8.6:
+browserslist@^4.0.0, browserslist@^4.8.3, browserslist@^4.8.5, browserslist@^4.8.6, browserslist@^4.9.1:
   version "4.9.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.9.1.tgz#01ffb9ca31a1aef7678128fc6a2253316aa7287c"
   integrity sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==
@@ -2464,9 +2464,9 @@ caniuse-api@^3.0.0:
     lodash.uniq "^4.5.0"
 
 caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001020, caniuse-lite@^1.0.30001030:
-  version "1.0.30001031"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001031.tgz#76f1bdd39e19567b855302f65102d9a8aaad5930"
-  integrity sha512-DpAP5a1NGRLgYfaNCaXIRyGARi+3tJA2quZXNNA1Du26VyVkqvy2tznNu5ANyN1Y5aX44QDotZSVSUSi2uMGjg==
+  version "1.0.30001032"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001032.tgz#b8d224914e2cd7f507085583d4e38144c652bce4"
+  integrity sha512-8joOm7BwcpEN4BfVHtfh0hBXSAPVYk+eUIcNntGtMkUWy/6AKRCDZINCLe3kB1vHhT2vBxBF85Hh9VlPXi/qjA==
 
 capture-exit@^2.0.0:
   version "2.0.0"
@@ -3343,7 +3343,7 @@ debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.8, debug@^2.6.9:
   dependencies:
     ms "2.0.0"
 
-debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5:
+debug@3.2.6, debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.5, debug@^3.2.6:
   version "3.2.6"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
   integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
@@ -3398,6 +3398,11 @@ deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
+deep-extend@^0.6.0:
+  version "0.6.0"
+  resolved "https://registry.yarnpkg.com/deep-extend/-/deep-extend-0.6.0.tgz#c4fa7c95404a17a9c3e8ca7e1537312b736330ac"
+  integrity sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==
+
 deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
@@ -3525,6 +3530,11 @@ detect-file@^1.0.0:
   resolved "https://registry.yarnpkg.com/detect-file/-/detect-file-1.0.0.tgz#f0d66d03672a825cb1b73bdb3fe62310c8e552b7"
   integrity sha1-8NZtA2cqglyxtzvbP+YjEMjlUrc=
 
+detect-libc@^1.0.2:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-1.0.3.tgz#fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"
+  integrity sha1-+hN8S9aY7fVc1c0CrFWfkaTEups=
+
 detect-node@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
@@ -3742,9 +3752,9 @@ ejs@^2.6.1:
   integrity sha512-7vmuyh5+kuUyJKePhQfRQBhXV5Ce+RnaeeQArKu1EAMpL3WbgMt5WG6uQZpEVvYSSsxMXRKOewtDk9RaTKXRlA==
 
 electron-to-chromium@^1.3.363:
-  version "1.3.367"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.367.tgz#48abffcaa6591051b612ae70ddc657763ede2662"
-  integrity sha512-GCHQreWs4zhKA48FNXCjvpV4kTnKoLu2PSAfKX394g34NPvTs2pPh1+jzWitNwhmOYI8zIqt36ulRVRZUgqlfA==
+  version "1.3.372"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.372.tgz#fb61b6dfe06f3278a384d084ebef75d463ec7580"
+  integrity sha512-77a4jYC52OdisHM+Tne7dgWEvQT1FoNu/jYl279pP88ZtG4ZRIPyhQwAKxj6C2rzsyC1OwsOds9JlZtNncSz6g==
 
 elliptic@^6.0.0:
   version "6.5.2"
@@ -4613,6 +4623,13 @@ fs-extra@^7.0.1:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-minipass@^1.2.5:
+  version "1.2.7"
+  resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
+  integrity sha512-GWSSJGFy4e9GUeCcbIkED+bgAoFyj7XF1mV8rma3QW4NIqX9Kyx79N/PF61H5udOV3aY1IaMLs6pGbH71nlCTA==
+  dependencies:
+    minipass "^2.6.0"
+
 fs-minipass@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-2.1.0.tgz#7f5036fdbf12c63c169190cbe4199c852271f9fb"
@@ -5232,7 +5249,7 @@ human-signals@^1.1.1:
   resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
   integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
 
-iconv-lite@0.4.24, iconv-lite@^0.4.24:
+iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
   integrity sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==
@@ -5261,6 +5278,13 @@ iferr@^0.1.5:
   resolved "https://registry.yarnpkg.com/iferr/-/iferr-0.1.5.tgz#c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"
   integrity sha1-xg7taebY/bazEEofy8ocGS3FtQE=
 
+ignore-walk@^3.0.1:
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-3.0.3.tgz#017e2447184bfeade7c238e4aefdd1e8f95b1e37"
+  integrity sha512-m7o6xuOaT1aqheYHKf8W6J5pYH85ZI9w077erOzLje3JsB1gkafkAhHHY19dqjulgIZHFm32Cp5uNZgcQqdJKw==
+  dependencies:
+    minimatch "^3.0.4"
+
 ignore@^3.0.11, ignore@^3.3.5:
   version "3.3.10"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-3.3.10.tgz#0a97fb876986e8081c631160f8f9f389157f0043"
@@ -5369,7 +5393,7 @@ inherits@2.0.3:
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
   integrity sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=
 
-ini@^1.3.4:
+ini@^1.3.4, ini@~1.3.0:
   version "1.3.5"
   resolved "https://registry.yarnpkg.com/ini/-/ini-1.3.5.tgz#eee25f56db1c9ec6085e0c22778083f596abf927"
   integrity sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==
@@ -6612,6 +6636,14 @@ minipass-pipeline@^1.2.2:
   dependencies:
     minipass "^3.0.0"
 
+minipass@^2.6.0, minipass@^2.8.6, minipass@^2.9.0:
+  version "2.9.0"
+  resolved "https://registry.yarnpkg.com/minipass/-/minipass-2.9.0.tgz#e713762e7d3e32fed803115cf93e04bca9fcc9a6"
+  integrity sha512-wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg==
+  dependencies:
+    safe-buffer "^5.1.2"
+    yallist "^3.0.0"
+
 minipass@^3.0.0, minipass@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz#7607ce778472a185ad6d89082aa2070f79cedcd5"
@@ -6619,6 +6651,13 @@ minipass@^3.0.0, minipass@^3.1.1:
   dependencies:
     yallist "^4.0.0"
 
+minizlib@^1.2.1:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-1.3.3.tgz#2290de96818a34c29551c8a8d301216bd65a861d"
+  integrity sha512-6ZYMOEnmVsdCeTJVE0W9ZD+pVnE8h9Hma/iOwwRDsdQoePpoX56/8B6z3P9VNwppJuBKNRuFDRNRqRWexT9G9Q==
+  dependencies:
+    minipass "^2.9.0"
+
 mississippi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/mississippi/-/mississippi-2.0.0.tgz#3442a508fafc28500486feea99409676e4ee5a6f"
@@ -6805,6 +6844,15 @@ natural-compare@^1.4.0:
   resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
   integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
 
+needle@^2.2.1:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.3.3.tgz#a041ad1d04a871b0ebb666f40baaf1fb47867117"
+  integrity sha512-EkY0GeSq87rWp1hoq/sH/wnTWgFVhYlnIkbJ0YJFfRgEFlz2RraCjBpFQ+vrEgEdp0ThfyHADmkChEhcb7PKyw==
+  dependencies:
+    debug "^3.2.6"
+    iconv-lite "^0.4.4"
+    sax "^1.2.4"
+
 negotiator@0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
@@ -6914,6 +6962,22 @@ node-modules-regexp@^1.0.0:
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
   integrity sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=
 
+node-pre-gyp@*:
+  version "0.14.0"
+  resolved "https://registry.yarnpkg.com/node-pre-gyp/-/node-pre-gyp-0.14.0.tgz#9a0596533b877289bcad4e143982ca3d904ddc83"
+  integrity sha512-+CvDC7ZttU/sSt9rFjix/P05iS43qHCOOGzcr3Ry99bXG7VX953+vFyEuph/tfqoYu8dttBkE86JSKBO2OzcxA==
+  dependencies:
+    detect-libc "^1.0.2"
+    mkdirp "^0.5.1"
+    needle "^2.2.1"
+    nopt "^4.0.1"
+    npm-packlist "^1.1.6"
+    npmlog "^4.0.2"
+    rc "^1.2.7"
+    rimraf "^2.6.1"
+    semver "^5.3.0"
+    tar "^4.4.2"
+
 node-releases@^1.1.50:
   version "1.1.50"
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.50.tgz#803c40d2c45db172d0410e4efec83aa8c6ad0592"
@@ -6956,7 +7020,7 @@ nodent-runtime@^3.2.1:
   dependencies:
     abbrev "1"
 
-nopt@~4.0.1:
+nopt@^4.0.1, nopt@~4.0.1:
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.1.tgz#d0d4685afd5415193c8c7505602d0d17cd64474d"
   integrity sha1-0NRoWv1UFRk8jHUFYC0NF81kR00=
@@ -7006,6 +7070,27 @@ normalize-url@^3.0.0:
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
 
+npm-bundled@^1.0.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.1.tgz#1edd570865a94cdb1bc8220775e29466c9fb234b"
+  integrity sha512-gqkfgGePhTpAEgUsGEgcq1rqPXA+tv/aVBlgEzfXwA1yiUJF7xtEt3CtVwOjNYQOVknDk0F20w58Fnm3EtG0fA==
+  dependencies:
+    npm-normalize-package-bin "^1.0.1"
+
+npm-normalize-package-bin@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/npm-normalize-package-bin/-/npm-normalize-package-bin-1.0.1.tgz#6e79a41f23fd235c0623218228da7d9c23b8f6e2"
+  integrity sha512-EPfafl6JL5/rU+ot6P3gRSCpPDW5VmIzX959Ob1+ySFUuuYHWHekXpwdUZcKP5C+DS4GEtdJluwBjnsNDl+fSA==
+
+npm-packlist@^1.1.6:
+  version "1.4.8"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-1.4.8.tgz#56ee6cc135b9f98ad3d51c1c95da22bbb9b2ef3e"
+  integrity sha512-5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A==
+  dependencies:
+    ignore-walk "^3.0.1"
+    npm-bundled "^1.0.1"
+    npm-normalize-package-bin "^1.0.1"
+
 npm-run-path@^2.0.0:
   version "2.0.2"
   resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f"
@@ -7020,7 +7105,7 @@ npm-run-path@^4.0.0:
   dependencies:
     path-key "^3.0.0"
 
-"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0:
+"npmlog@0 || 1 || 2 || 3 || 4", npmlog@^4.0.0, npmlog@^4.0.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-4.1.2.tgz#08a7f2a8bf734604779a9efa4ad5cc717abb954b"
   integrity sha512-2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg==
@@ -8062,7 +8147,7 @@ pretty@^2.0.0:
     extend-shallow "^2.0.1"
     js-beautify "^1.6.12"
 
-private@^0.1.6:
+private@^0.1.8:
   version "0.1.8"
   resolved "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz#2381edb3689f7a53d653190060fcf822d2f368ff"
   integrity sha512-VvivMrbvd2nKkiG38qjULzlc+4Vx4wm/whI9pQD35YrARNnhxeiRktSOhSukRLFNlzg6Br/cJPet5J/u19r/mg==
@@ -8235,6 +8320,16 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
+rc@^1.2.7:
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/rc/-/rc-1.2.8.tgz#cd924bf5200a075b83c188cd6b9e211b7fc0d3ed"
+  integrity sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==
+  dependencies:
+    deep-extend "^0.6.0"
+    ini "~1.3.0"
+    minimist "^1.2.0"
+    strip-json-comments "~2.0.1"
+
 react-is@^16.12.0:
   version "16.13.0"
   resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.0.tgz#0f37c3613c34fe6b37cd7f763a0d6293ab15c527"
@@ -8359,17 +8454,18 @@ regenerator-runtime@^0.12.0:
   resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.12.1.tgz#fa1a71544764c036f8c49b13a08b2594c9f8a0de"
   integrity sha512-odxIc1/vDlo4iZcfXqRYFj0vpXFNoGdKMAUieAlFYO6m/nl5e9KR/beGf41z4a1FI+aQgtjhuaSlDxQ0hmkrHg==
 
-regenerator-runtime@^0.13.2:
-  version "0.13.3"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5"
-  integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw==
+regenerator-runtime@^0.13.4:
+  version "0.13.4"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz#e96bf612a3362d12bb69f7e8f74ffeab25c7ac91"
+  integrity sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==
 
-regenerator-transform@^0.14.0:
-  version "0.14.1"
-  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb"
-  integrity sha512-flVuee02C3FKRISbxhXl9mGzdbWUVHubl1SMaknjxkFB1/iqpJhArQUvRxOOPEc/9tAiX0BaQ28FJH10E4isSQ==
+regenerator-transform@^0.14.2:
+  version "0.14.2"
+  resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.2.tgz#949d9d87468ff88d5a7e4734ebb994a892de1ff2"
+  integrity sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==
   dependencies:
-    private "^0.1.6"
+    "@babel/runtime" "^7.8.4"
+    private "^0.1.8"
 
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
@@ -8702,7 +8798,7 @@ sass-loader@^8.0.2:
     schema-utils "^2.6.1"
     semver "^6.3.0"
 
-sax@~1.2.4:
+sax@^1.2.4, sax@~1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
   integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -8759,7 +8855,7 @@ selfsigned@^1.10.7, selfsigned@^1.9.1:
   dependencies:
     node-forge "0.9.0"
 
-"semver@2 || 3 || 4 || 5", semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.5.1, semver@^5.6.0, semver@^5.7.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -9363,7 +9459,7 @@ strip-indent@^1.0.1:
   dependencies:
     get-stdin "^4.0.1"
 
-strip-json-comments@2.0.1, strip-json-comments@^2.0.1:
+strip-json-comments@2.0.1, strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
   integrity sha1-PFMZQukIwml8DsNEhYwobHygpgo=
@@ -9463,6 +9559,13 @@ svg.select.js@^2.1.2:
   dependencies:
     svg.js "^2.2.5"
 
+svg.select.js@^3.0.1:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/svg.select.js/-/svg.select.js-3.0.1.tgz#a4198e359f3825739226415f82176a90ea5cc917"
+  integrity sha512-h5IS/hKkuVCbKSieR9uQCj9w+zLHoPh+ce19bBYyqF53g6mnPB8sAtIbe1s9dh2S2fCmYX2xel1Ln3PJBbK4kw==
+  dependencies:
+    svg.js "^2.6.5"
+
 svgo@^1.0.0:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
@@ -9511,6 +9614,19 @@ tar@^2.0.0:
     fstream "^1.0.12"
     inherits "2"
 
+tar@^4.4.2:
+  version "4.4.13"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-4.4.13.tgz#43b364bc52888d555298637b10d60790254ab525"
+  integrity sha512-w2VwSrBoHa5BsSyH+KxEqeQBAllHhccyMFVHtGtdMpF4W7IRWfZjFiQceJPChOeTsSDVUpER2T8FA93pr0L+QA==
+  dependencies:
+    chownr "^1.1.1"
+    fs-minipass "^1.2.5"
+    minipass "^2.8.6"
+    minizlib "^1.2.1"
+    mkdirp "^0.5.0"
+    safe-buffer "^5.1.2"
+    yallist "^3.0.3"
+
 terser-webpack-plugin@^1.1.0, terser-webpack-plugin@^1.4.3:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz#5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"
@@ -10152,11 +10268,11 @@ vuex@^3.1.2:
   integrity sha512-ha3jNLJqNhhrAemDXcmMJMKf1Zu4sybMPr9KxJIuOpVcsDQlTBYLLladav2U+g1AvdYDG5Gs0xBTb0M5pXXYFQ==
 
 w3c-hr-time@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.1.tgz#82ac2bff63d950ea9e3189a58a65625fedf19045"
-  integrity sha1-gqwr/2PZUOqeMYmlimViX+3xkEU=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd"
+  integrity sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==
   dependencies:
-    browser-process-hrtime "^0.1.2"
+    browser-process-hrtime "^1.0.0"
 
 w3c-xmlserializer@^2.0.0:
   version "2.0.0"
@@ -10624,7 +10740,7 @@ yallist@^2.1.2:
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52"
   integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=
 
-yallist@^3.0.2:
+yallist@^3.0.0, yallist@^3.0.2, yallist@^3.0.3:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-3.1.1.tgz#dbb7daf9bfd8bac9ab45ebf602b8cbad0d5d08fd"
   integrity sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==
diff --git a/types/configs/migration.go b/types/configs/migration.go
index b7a17b10..d04d3455 100644
--- a/types/configs/migration.go
+++ b/types/configs/migration.go
@@ -74,7 +74,25 @@ func (c *DbConfig) MigrateDatabase() error {
 	if err := tx.Commit().Error(); err != nil {
 		return err
 	}
-	log.Infoln("Statping Database Migrated")
+	log.Infoln("Statping Database Tables Migrated")
+
+	if err := database.DB().Model(&hits.Hit{}).AddIndex("idx_service_hit", "service").Error(); err != nil {
+		log.Errorln(err)
+	}
+
+	if err := database.DB().Model(&hits.Hit{}).AddIndex("hit_created_at", "created_at").Error(); err != nil {
+		log.Errorln(err)
+	}
+
+	if err := database.DB().Model(&failures.Failure{}).AddIndex("idx_service_fail", "service").Error(); err != nil {
+		log.Errorln(err)
+	}
+
+	if err := database.DB().Model(&failures.Failure{}).AddIndex("idx_checkin_fail", "checkin").Error(); err != nil {
+		log.Errorln(err)
+	}
+
+	log.Infoln("Statping Database Indexes Migrated")
 
 	return nil
 }