Update dashboard and admin module to work properly hand in hand