Dashboard added. Small refactor