Merge "GUI Changes - Tag ID"