Refactor buttons through tags (suite)