Many changes to templates, to improve UI