More content tweaks