Add more text, Fix some classes