Added classes for mapping and fixed CSS