Improved Tweet and Instagram templates