Small Styling fixes ready for live push

Also addition of YARPP templates