Adding post content and layout
Fixed merge conflict