Added class attrib and fixed select