Refactor buttons through tags