Project show page layout
Fixed merge conflicts