Make controls UI more compact
Fix bug with tag view