Proper labels for visibility. Closes #1136.