Move to flat tracking schema. Update some bug fixes. User template helpers and form macro.