Tag layout fixes