completed all view project functionality
fixed merge conflicts