Ported old tag control over to new UI