Move IDs to buttons from hidden elements

Signed-off-by: Michal Čihař <michal@cihar.com>