added markup and templates