new ui fix + tag fix