Fixed the labels and made some rotated.
Merge branch 'test'