Add form for list items and minor template cleanup