#899 Add new comment field object
#899 Update style to match new comment field
#905 Rename template