re-organise all templates, add right column2