Updated present / dismiss behavior

Removed delegation to make it as simple as possible