Fixing content and formatting