Added more templates and mockup