CSS fix + code formatting