Tag: fix design mistakes