Merge "Improve layout of tagging dialog"