Refactor Project and Team pages