Improved "add entity" button from contribute