Added class names to a few elements