Updated templates and post as per comments from Stefcho