wip
merge front end updates along with templates factorisation