Major refactoring of project view