Fix minor template bug
Update component list