Adding fixes to contentpage template
Adding 2 column page template and page component