Few content tweaks