Fixed performance problems

Fixed performance in project page (refactored)