added multiple changes to grid structure and project page
merged conflicts