move custom actions to the end
add default comments back