fix tags col
add close btn in alert
Merge branch 'develop'