CON-1446 | updated template's markup and its creation in controller