added sorting by project and site

and reformatting data