some more new table template adjustments, sorry