Fix some template/style