Dashboard servlet updates
Refactoring DashboardServlet code