Feature/tpl component views

More tpl updates