Port various tagging fixes from the main branch.
Fix alignment issue on moveTag modal box.