rearranging things and working on project page