Changed some calculations and project view page