MEDIUM / Fixed some issues with wrong class names