worked on #2 and worked on single page template for #16