Refactored project views