Fix DI, ElementTemplate, add predefined elements, fix marker creation.