dashboard with icons
solved conflcts