Add Now button, a big buggy :)

Harmonise id handling