Fix cascade delete and menu