Some improvements

Hi,

- Fix focus issue
- Duplicate
- Collapse.

Hope it helps,
Xavier.