Fix #97

Make "class" of all elements more dedicated