added feedback model and some template improvement