Updates in dashboard
Application refactor