Adjusted some labels.
Merge branch 'master' into dimenovels.org