move custom actions to the end
add default comments back
add comments for the custom actions
add default comments back
add default comments back