Bugfix and add colorful labels