Vadlidation fixes

Fixing a tags and buttons