Project show page layout
Fixed merge conflicts
Merge conflict sorted