Fixing the Tag layouts