improved template rendering, overall UI