Move buttons tags in buttons package

Fix match view
Add messages on view match NotFound