Project role refactoring / page refacotring