Better styles for #107
Fix class