Minor UI updates, move tags.