Class Fredrik implementation
CSS update
Correcting mushup