Adding missing character encoding in layout
Adding iconography for classes