added more class names and continued formatting