Improve labels navigation
Merge pull request #534 from dlsniper/improve-labels

Improve labels navigation