Better way of doing this
Fix some class names
Maintenance CSS