Remove empty tags design
Merge branch 'design_merge'