xoa 1 tab, them 2 tab
merge dev_mac branch