refactor for #282
fix #282
Fix #281
invert styles re #281