clean modal and context menu creation
fixes some finder issues