Project list Refactored