design project dashboard and refactor full project
resolved conflict