make update work; move templatetags to core; add 2 and 4 column form template