rearrange the order of buttons
improved the quality of buttons and tags for a better user experience