Fix misc issues
Rename CSS